From 495f8f12ec17ece5708407ef09ece89887ea73bc Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Tue, 18 Apr 2017 11:00:17 +0200
Subject: 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>
---
 examples/quick/demos/demos.pro                   | 6 ++----
 examples/quick/demos/photoviewer/main.cpp        | 4 ++--
 examples/quick/demos/photoviewer/photoviewer.pro | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'examples')

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
 
-- 
cgit v1.2.3