diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:08:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:08:24 +0200 |
| commit | 0aaca005c0bb6267ddd14a84634c33c813e2d2c4 (patch) | |
| tree | 2c09a2498618830b32e92f13450fab2210aae446 /examples | |
| parent | 186cbe30939947e3a2d33b250fc861cbee361dfe (diff) | |
| parent | 749a7212e903d8e8c6f256edb1836b9449cc7fe1 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ibed6ee74d36b4ce37391c82db00a0abd30d09e7a
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/demos/demos.pro | 6 | ||||
| -rw-r--r-- | examples/quick/demos/photoviewer/main.cpp | 4 | ||||
| -rw-r--r-- | examples/quick/demos/photoviewer/photoviewer.pro | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro index 5a6fd52baf..0644b81a22 100644 --- a/examples/quick/demos/demos.pro +++ b/examples/quick/demos/demos.pro @@ -7,7 +7,5 @@ SUBDIRS = samegame \ photosurface \ stocqt -qtHaveModule(xmlpatterns) { - SUBDIRS += rssnews - qtHaveModule(widgets): SUBDIRS += photoviewer -} +qtHaveModule(xmlpatterns): SUBDIRS += rssnews photoviewer + diff --git a/examples/quick/demos/photoviewer/main.cpp b/examples/quick/demos/photoviewer/main.cpp index 172d14307e..a269a61dcb 100644 --- a/examples/quick/demos/photoviewer/main.cpp +++ b/examples/quick/demos/photoviewer/main.cpp @@ -48,14 +48,14 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QGuiApplication> #include <QQmlApplicationEngine> #include <QTranslator> #include <QDebug> int main(int argc, char *argv[]) { - QApplication app(argc, argv); + QGuiApplication app(argc, argv); QTranslator qtTranslator; qtTranslator.load("qml_" + QLocale::system().name(), ":/i18n/"); diff --git a/examples/quick/demos/photoviewer/photoviewer.pro b/examples/quick/demos/photoviewer/photoviewer.pro index 4bfdb86f31..68e43e13f9 100644 --- a/examples/quick/demos/photoviewer/photoviewer.pro +++ b/examples/quick/demos/photoviewer/photoviewer.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += qml quick widgets xmlpatterns +QT += qml quick xmlpatterns SOURCES += main.cpp |