diff options
| -rw-r--r-- | examples/declarative/map3d/qmlmap3d.cpp | 8 | ||||
| -rw-r--r-- | examples/declarative/mapviewer/qmlmapviewer.cpp | 4 | ||||
| -rw-r--r-- | examples/declarative/qmlplaces/main.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 3 | ||||
| -rw-r--r-- | tests/declarativetestplugin/declarativetestplugin.pro | 2 |
5 files changed, 12 insertions, 9 deletions
diff --git a/examples/declarative/map3d/qmlmap3d.cpp b/examples/declarative/map3d/qmlmap3d.cpp index bd9cbe77..fbef2ea7 100644 --- a/examples/declarative/map3d/qmlmap3d.cpp +++ b/examples/declarative/map3d/qmlmap3d.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtWidgets/QApplication> +#include <QtGui/QGuiApplication> #include <QtCore/QStringList> #include <QtDeclarative/QDeclarativeEngine> #include <QNetworkProxy> @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) { - QApplication app(argc, argv); + QGuiApplication app(argc, argv); QSGView view; const QString mainQmlApp = QLatin1String("qrc:///map3d.qml"); @@ -62,9 +62,9 @@ int main(int argc, char *argv[]) // Qt.quit() called in embedded .qml by default only emits // quit() signal, so do this (optionally use Qt.exit()). QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit())); - if (QApplication::arguments().contains(QLatin1String("-maximize"))) { + if (QCoreApplication::arguments().contains(QLatin1String("-maximize"))) { view.showMaximized(); - } else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) { + } else if (QCoreApplication::arguments().contains(QLatin1String("-fullscreen"))) { view.showFullScreen(); } else { //view.setGeometry(QRect(100, 100, 360, 640)); diff --git a/examples/declarative/mapviewer/qmlmapviewer.cpp b/examples/declarative/mapviewer/qmlmapviewer.cpp index 7efb9b44..5d8b8a26 100644 --- a/examples/declarative/mapviewer/qmlmapviewer.cpp +++ b/examples/declarative/mapviewer/qmlmapviewer.cpp @@ -38,14 +38,14 @@ ** ****************************************************************************/ -#include <QtWidgets/QApplication> +#include <QtGui/QGuiApplication> #include <QtDeclarative/QSGView> #include <QtDeclarative/QDeclarativeEngine> #include <QNetworkProxy> int main(int argc, char *argv[]) { - QApplication application(argc, argv); + QGuiApplication application(argc, argv); const QString mainQmlApp = QLatin1String("qrc:///mapviewer.qml"); QSGView view; view.setSource(QUrl(mainQmlApp)); diff --git a/examples/declarative/qmlplaces/main.cpp b/examples/declarative/qmlplaces/main.cpp index 1cc93ff3..1a8a2611 100644 --- a/examples/declarative/qmlplaces/main.cpp +++ b/examples/declarative/qmlplaces/main.cpp @@ -1,4 +1,4 @@ -#include <QApplication> +#include <QGuiApplication> #include <QtDeclarative/QSGView> #include <QtDeclarative/QDeclarativeEngine> #include <QtDeclarative/QDeclarativeContext> @@ -8,7 +8,7 @@ int main(int argc, char *argv[]) { - QApplication a(argc, argv); + QGuiApplication a(argc, argv); // setting proxy for application. It will be used in all clients. QString urlEnv = getenv("HTTP_PROXY"); diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index ad5c6453..485aeeeb 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -26,3 +26,6 @@ SUBDIRS += geotestplugin \ contains(config_test_jsondb, yes) { SUBDIRS += qplacemanager_jsondb } + +!contains(QT_CONFIG,private-tests):SUBDIRS -= \ + sphere diff --git a/tests/declarativetestplugin/declarativetestplugin.pro b/tests/declarativetestplugin/declarativetestplugin.pro index 78afd0aa..d3091598 100644 --- a/tests/declarativetestplugin/declarativetestplugin.pro +++ b/tests/declarativetestplugin/declarativetestplugin.pro @@ -3,7 +3,7 @@ TARGETPATH = Qt/location/test include(../../src/imports/location/qlocationimport.pri) -QT += declarative location +QT += declarative location widgets DESTDIR = $$QT.location.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH |