summaryrefslogtreecommitdiffstats
path: root/examples/nfc
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-02-18 15:28:48 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-20 14:03:38 +0100
commit0156038682cc40d44fedfc28dc9b78d1a0e6203b (patch)
treeb9e4d8eb8a0ab59fabc1f8ff043241c1ae030400 /examples/nfc
parentb4bde05d8459cc57c25bac3f7be19fcf03908606 (diff)
the poster example needs no widgets, but it needs quick
Task-number: QTBUG-36893 Change-Id: Ic77fe07aa450001386be0b2e0d4a99f2e674dbb2 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Diffstat (limited to 'examples/nfc')
-rw-r--r--examples/nfc/nfc.pro5
-rw-r--r--examples/nfc/poster/poster.pro2
-rw-r--r--examples/nfc/poster/qmlposter.cpp4
3 files changed, 7 insertions, 4 deletions
diff --git a/examples/nfc/nfc.pro b/examples/nfc/nfc.pro
index e4f7e35b..0076a711 100644
--- a/examples/nfc/nfc.pro
+++ b/examples/nfc/nfc.pro
@@ -2,7 +2,10 @@ TEMPLATE = subdirs
qtHaveModule(widgets) {
SUBDIRS += \
annotatedurl \
- ndefeditor \
+ ndefeditor
+}
+qtHaveModule(quick) {
+ SUBDIRS += \
poster
}
diff --git a/examples/nfc/poster/poster.pro b/examples/nfc/poster/poster.pro
index 47de2986..b6e87ed6 100644
--- a/examples/nfc/poster/poster.pro
+++ b/examples/nfc/poster/poster.pro
@@ -1,4 +1,4 @@
-QT += qml quick network nfc widgets
+QT += qml quick network nfc
SOURCES += \
qmlposter.cpp
diff --git a/examples/nfc/poster/qmlposter.cpp b/examples/nfc/poster/qmlposter.cpp
index 89f36956..2fc943d4 100644
--- a/examples/nfc/poster/qmlposter.cpp
+++ b/examples/nfc/poster/qmlposter.cpp
@@ -38,13 +38,13 @@
**
****************************************************************************/
-#include <QtWidgets/QApplication>
+#include <QtGui/QGuiApplication>
#include <QtQml/QQmlEngine>
#include <QtQuick/QQuickView>
int main(int argc, char *argv[])
{
- QApplication application(argc, argv);
+ QGuiApplication application(argc, argv);
const QString mainQmlApp = QLatin1String("qrc:/poster.qml");
QQuickView view;
view.setSource(QUrl(mainQmlApp));