diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-04-18 11:00:17 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-04-18 09:18:06 +0000 |
| commit | 495f8f12ec17ece5708407ef09ece89887ea73bc (patch) | |
| tree | 8d3ee4ee1c2f8b8a487f1acd5c9656059c6c99d9 /examples/quick | |
| parent | 1bee1eb0f80ca099945e60c113d24f7fa1e0ef29 (diff) | |
photoviewer example: don't depend on widgets
It was never necessary for this example.
This reverts commit 452a78d0ac4a1579733a8ab641be24c9b7c0dd96.
Task-number: QTBUG-60014
Change-Id: Ib3f30d1d5de21d567919aa650bf3334247d5f271
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'examples/quick')
| -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 |