From f3d8f66116af4319650d8f3e7ca069275fdfa780 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <mccarthy.aaron@gmail.com>
Date: Mon, 1 Oct 2012 13:28:16 +1000
Subject: Further porting of NFC module from mobility to Qt 5.

Includes the following changes:

    * Conditionally enables building of the NFC module when qmake is
      run with CONFIG+=nfc.
    * Correctly build within the QtNfc namespace.
    * Fix compile errors in examples, enable building of NFC examples.
    * Fix compile errors in tests, enable building of NFC tests.

Mark the some NFC tests as insignificant as they currently crash.

Notably does not enable NFC documentation generation.

Task-number: QTBUG-22015

Change-Id: I9ff170c45848c8f0215e9427797922f840c2f015
Reviewed-by: Alex <ablasche@gmail.com>
---
 examples/examples.pro             | 11 ++---------
 examples/nfc/nfc.pro              |  7 +++++++
 examples/nfc/poster/poster.pro    |  2 +-
 examples/nfc/poster/qmlposter.cpp |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 examples/nfc/nfc.pro

(limited to 'examples')

diff --git a/examples/examples.pro b/examples/examples.pro
index 36b1ecb5..a6efc9a0 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,11 +1,4 @@
 TEMPLATE = subdirs
-!contains(QT_CONFIG, no-widgets) {
-    SUBDIRS += bluetooth
-}
 
-SUBDIRS += bluetooth
-
-#Qt NFC based examples
-#SUBDIRS += poster \
-#           ndefeditor \
-#           annotatedurl
+!isEmpty(QT.bluetooth.name):SUBDIRS += bluetooth
+!isEmpty(QT.nfc.name):SUBDIRS += nfc
diff --git a/examples/nfc/nfc.pro b/examples/nfc/nfc.pro
new file mode 100644
index 00000000..d219924c
--- /dev/null
+++ b/examples/nfc/nfc.pro
@@ -0,0 +1,7 @@
+TEMPLATE = subdirs
+!contains(QT_CONFIG, no-widgets) {
+    SUBDIRS += \
+        annotatedurl \
+        ndefeditor \
+        poster
+}
diff --git a/examples/nfc/poster/poster.pro b/examples/nfc/poster/poster.pro
index de2e1a05..d108b2a2 100644
--- a/examples/nfc/poster/poster.pro
+++ b/examples/nfc/poster/poster.pro
@@ -1,4 +1,4 @@
-QT += declarative quick network nfc widgets
+QT += qml quick network nfc widgets
 
 SOURCES += \
     qmlposter.cpp
diff --git a/examples/nfc/poster/qmlposter.cpp b/examples/nfc/poster/qmlposter.cpp
index 606a96f8..cb75c2a1 100644
--- a/examples/nfc/poster/qmlposter.cpp
+++ b/examples/nfc/poster/qmlposter.cpp
@@ -39,8 +39,8 @@
 ****************************************************************************/
 
 #include <QtWidgets/QApplication>
+#include <QtQml/QQmlEngine>
 #include <QtQuick/QQuickView>
-#include <QtDeclarative/QDeclarativeEngine>
 
 int main(int argc, char *argv[])
 {
-- 
cgit v1.2.3