6aad4122332c0291e2e3249b508c7583428177b9 in qtbase removed implicit
linking to libQtWidgets. Projects which implicitly used that module
were broken.
Either remove the dependency where it is not required, or explicitly
opt-in to libQtWidgets where it is required.
Change-Id: I6f4fb1d98bdf5bb65b4f02a1d245d334314b163d
Reviewed-on: http://codereview.qt-project.org/5268
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
**
****************************************************************************/
-#include <QApplication>
+#include <QGuiApplication>
#include <QNetworkAccessManager>
#include <QNetworkProxy>
{
QUrl source("qrc:view.qml");
- QApplication app(argc, argv);
+ QGuiApplication app(argc, argv);
for (int i = 1; i < argc; ++i) {
QString arg(argv[i]);
#include <qdebug.h>
#include <qdatetime.h>
#include <qbasictimer.h>
-#include <qapplication.h>
+#include <qcoreapplication.h>
// Implements a "TimeModel" class with hour and minute properties
// that change on-the-minute yet efficiently sleep the rest
{
if (++instances == 1) {
if (!timer)
- timer = new MinuteTimer(qApp);
+ timer = new MinuteTimer(QCoreApplication::instance());
connect(timer, SIGNAL(timeChanged()), this, SIGNAL(timeChanged()));
timer->start();
}
TARGET = extended
DEPENDPATH += .
INCLUDEPATH += .
-QT += declarative
+QT += declarative widgets
# Input
SOURCES += main.cpp \
**
****************************************************************************/
-#include <QApplication>
+#include <QGuiApplication>
#include <qdeclarativeengine.h>
#include <qdeclarativecontext.h>
//![0]
int main(int argc, char ** argv)
{
- QApplication app(argc, argv);
+ QGuiApplication app(argc, argv);
QList<QObject*> dataList;
dataList.append(new DataObject("Item 1", "red"));
**
****************************************************************************/
-#include <QApplication>
+#include <QGuiApplication>
#include <QStringList>
#include <qdeclarativeengine.h>
int main(int argc, char ** argv)
{
- QApplication app(argc, argv);
+ QGuiApplication app(argc, argv);
//![0]
QStringList dataList;
**
****************************************************************************/
-#include <QApplication>
+#include <QGuiApplication>
#include <QPainter>
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qsgview.h>
int main(int argc, char ** argv)
{
- QApplication app(argc, argv);
+ QGuiApplication app(argc, argv);
qmlRegisterType<MyPaintItem>("MyModule", 1, 0, "MyPaintItem");
//![0]
#include "piechart.h"
#include <QSGView>
-#include <QApplication>
+#include <QGuiApplication>
int main(int argc, char *argv[])
{
- QApplication app(argc, argv);
+ QGuiApplication app(argc, argv);
qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart");
//![0]
#include "piechart.h"
#include <QSGView>
-#include <QApplication>
+#include <QGuiApplication>
int main(int argc, char *argv[])
{
- QApplication app(argc, argv);
+ QGuiApplication app(argc, argv);
qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart");
//![0]
#include "piechart.h"
#include <QSGView>
-#include <QApplication>
+#include <QGuiApplication>
int main(int argc, char *argv[])
{
- QApplication app(argc, argv);
+ QGuiApplication app(argc, argv);
qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart");
#include "pieslice.h"
#include <QSGView>
-#include <QApplication>
+#include <QGuiApplication>
//![0]
int main(int argc, char *argv[])
{
//![0]
- QApplication app(argc, argv);
+ QGuiApplication app(argc, argv);
qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart");
#include "pieslice.h"
#include <QSGView>
-#include <QApplication>
+#include <QGuiApplication>
int main(int argc, char *argv[])
{
- QApplication app(argc, argv);
+ QGuiApplication app(argc, argv);
qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart");
qmlRegisterType<PieSlice>("Charts", 1, 0, "PieSlice");
load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui network
macx:CONFIG -= app_bundle
HEADERS += ../shared/testhttpserver.h
CONFIG += parallel_test
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private network widgets
qpa:CONFIG+=insignificant_test # QTBUG-21004 fails, unstably
load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
macx:CONFIG -= app_bundle
SOURCES += tst_qsgpathview.cpp
CONFIG += parallel_test
#temporary
CONFIG += insignificant_test
-QT += core-private gui-private v8-private declarative-private
+QT += core-private gui-private v8-private declarative-private widgets
load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
macx:CONFIG -= app_bundle
SOURCES += tst_qsgvisualdatamodel.cpp
CONFIG += parallel_test
-QT += core-private gui-private v8-private declarative-private
+QT += core-private gui-private v8-private declarative-private widgets