From 4114b9dcff68cdebc36e3b4818d4463d62421ecf Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Wed, 21 Sep 2011 10:18:15 +1000
Subject: [PATCH] Fixed compile of examples and tests.
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>
---
.../cppextensions/networkaccessmanagerfactory/main.cpp | 4 ++--
examples/declarative/cppextensions/plugins/plugin.cpp | 4 ++--
.../cppextensions/referenceexamples/extended/extended.pro | 2 +-
examples/declarative/modelviews/objectlistmodel/main.cpp | 4 ++--
examples/declarative/modelviews/stringlistmodel/main.cpp | 4 ++--
examples/declarative/painteditem/smile/main.cpp | 4 ++--
.../declarative/tutorials/extending/chapter1-basics/main.cpp | 4 ++--
.../declarative/tutorials/extending/chapter2-methods/main.cpp | 4 ++--
.../tutorials/extending/chapter3-bindings/main.cpp | 4 ++--
.../tutorials/extending/chapter4-customPropertyTypes/main.cpp | 4 ++--
.../tutorials/extending/chapter5-listproperties/main.cpp | 4 ++--
tests/auto/declarative/qsgborderimage/qsgborderimage.pro | 3 +--
tests/auto/declarative/qsgpathview/qsgpathview.pro | 3 +--
.../declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro | 3 +--
14 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp b/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
index 2da6e3c8fe..7caeaf9471 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
+++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
@@ -38,7 +38,7 @@
**
****************************************************************************/
-#include <QApplication>
+#include <QGuiApplication>
#include <QNetworkAccessManager>
#include <QNetworkProxy>
@@ -80,7 +80,7 @@ int main(int argc, char ** argv)
{
QUrl source("qrc:view.qml");
- QApplication app(argc, argv);
+ QGuiApplication app(argc, argv);
for (int i = 1; i < argc; ++i) {
QString arg(argv[i]);
diff --git a/examples/declarative/cppextensions/plugins/plugin.cpp b/examples/declarative/cppextensions/plugins/plugin.cpp
index 056e09383b..299b0ff3e7 100644
--- a/examples/declarative/cppextensions/plugins/plugin.cpp
+++ b/examples/declarative/cppextensions/plugins/plugin.cpp
@@ -43,7 +43,7 @@
#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
@@ -109,7 +109,7 @@ public:
{
if (++instances == 1) {
if (!timer)
- timer = new MinuteTimer(qApp);
+ timer = new MinuteTimer(QCoreApplication::instance());
connect(timer, SIGNAL(timeChanged()), this, SIGNAL(timeChanged()));
timer->start();
}
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
index d4c9dc9c6e..78585f6906 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
+++ b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = extended
DEPENDPATH += .
INCLUDEPATH += .
-QT += declarative
+QT += declarative widgets
# Input
SOURCES += main.cpp \
diff --git a/examples/declarative/modelviews/objectlistmodel/main.cpp b/examples/declarative/modelviews/objectlistmodel/main.cpp
index 345b5eec87..ba37e17d18 100644
--- a/examples/declarative/modelviews/objectlistmodel/main.cpp
+++ b/examples/declarative/modelviews/objectlistmodel/main.cpp
@@ -38,7 +38,7 @@
**
****************************************************************************/
-#include <QApplication>
+#include <QGuiApplication>
#include <qdeclarativeengine.h>
#include <qdeclarativecontext.h>
@@ -56,7 +56,7 @@
//![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"));
diff --git a/examples/declarative/modelviews/stringlistmodel/main.cpp b/examples/declarative/modelviews/stringlistmodel/main.cpp
index 1f474c4cc6..5d01c6fae8 100644
--- a/examples/declarative/modelviews/stringlistmodel/main.cpp
+++ b/examples/declarative/modelviews/stringlistmodel/main.cpp
@@ -38,7 +38,7 @@
**
****************************************************************************/
-#include <QApplication>
+#include <QGuiApplication>
#include <QStringList>
#include <qdeclarativeengine.h>
@@ -55,7 +55,7 @@
int main(int argc, char ** argv)
{
- QApplication app(argc, argv);
+ QGuiApplication app(argc, argv);
//![0]
QStringList dataList;
diff --git a/examples/declarative/painteditem/smile/main.cpp b/examples/declarative/painteditem/smile/main.cpp
index bc3a9d6b03..423ff295c9 100644
--- a/examples/declarative/painteditem/smile/main.cpp
+++ b/examples/declarative/painteditem/smile/main.cpp
@@ -38,7 +38,7 @@
**
****************************************************************************/
-#include <QApplication>
+#include <QGuiApplication>
#include <QPainter>
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qsgview.h>
@@ -68,7 +68,7 @@ public:
int main(int argc, char ** argv)
{
- QApplication app(argc, argv);
+ QGuiApplication app(argc, argv);
qmlRegisterType<MyPaintItem>("MyModule", 1, 0, "MyPaintItem");
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp b/examples/declarative/tutorials/extending/chapter1-basics/main.cpp
index 4c11768e18..ca6a97e0c7 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter1-basics/main.cpp
@@ -40,11 +40,11 @@
//![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");
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp b/examples/declarative/tutorials/extending/chapter2-methods/main.cpp
index 4c11768e18..ca6a97e0c7 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter2-methods/main.cpp
@@ -40,11 +40,11 @@
//![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");
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp b/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp
index 4c11768e18..ca6a97e0c7 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp
@@ -40,11 +40,11 @@
//![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");
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp
index 1113cc55cb..d2812767cf 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp
@@ -41,13 +41,13 @@
#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");
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp b/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp
index 1c43a090ca..64c18f74bc 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp
@@ -41,11 +41,11 @@
#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");
diff --git a/tests/auto/declarative/qsgborderimage/qsgborderimage.pro b/tests/auto/declarative/qsgborderimage/qsgborderimage.pro
index 7b0c1d5560..5a68e67e44 100644
--- a/tests/auto/declarative/qsgborderimage/qsgborderimage.pro
+++ b/tests/auto/declarative/qsgborderimage/qsgborderimage.pro
@@ -1,5 +1,4 @@
load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui network
macx:CONFIG -= app_bundle
HEADERS += ../shared/testhttpserver.h
@@ -15,6 +14,6 @@ symbian: {
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
diff --git a/tests/auto/declarative/qsgpathview/qsgpathview.pro b/tests/auto/declarative/qsgpathview/qsgpathview.pro
index 312443f591..a9b3838a0c 100644
--- a/tests/auto/declarative/qsgpathview/qsgpathview.pro
+++ b/tests/auto/declarative/qsgpathview/qsgpathview.pro
@@ -1,5 +1,4 @@
load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
macx:CONFIG -= app_bundle
SOURCES += tst_qsgpathview.cpp
@@ -15,4 +14,4 @@ symbian: {
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
diff --git a/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro b/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro
index 7770f8ff0f..31047068d7 100644
--- a/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro
+++ b/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro
@@ -1,5 +1,4 @@
load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
macx:CONFIG -= app_bundle
SOURCES += tst_qsgvisualdatamodel.cpp
@@ -14,4 +13,4 @@ symbian: {
CONFIG += parallel_test
-QT += core-private gui-private v8-private declarative-private
+QT += core-private gui-private v8-private declarative-private widgets
--
GitLab