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>

8 files changed, 115 insertions, 49 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index dec893bb..e3539b57 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,51 +1,32 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    qbluetoothaddress \
-    qbluetoothdevicediscoveryagent \
-    qbluetoothdeviceinfo \
-    qbluetoothlocaldevice \
-    qbluetoothhostinfo \
-    qbluetoothservicediscoveryagent \
-    qbluetoothserviceinfo \
-    qbluetoothsocket \
-    qbluetoothtransfermanager \
-    qbluetoothtransferrequest \
-    qbluetoothuuid \
-    ql2capserver \
-#    qndefmessage \
-#    qndefrecord \
-#    qnearfieldmanager \
-#    qnearfieldtagtype1 \
-#    qnearfieldtagtype2 \
-    qrfcommserver \
     cmake
 
-!contains(QT_CONFIG, bluetooth): SUBDIRS -= \
-    qbluetoothaddress \
-    qbluetoothdevicediscoveryagent \
-    qbluetoothdeviceinfo \
-    qbluetoothlocaldevice \
-    qbluetoothhostinfo \
-    qbluetoothservicediscoveryagent \
-    qbluetoothserviceinfo \
-    qbluetoothsocket \
-    qbluetoothtransfermanager \
-    qbluetoothtransferrequest \
-    qbluetoothuuid \
-    ql2capserver \
+!isEmpty(QT.bluetooth.name) {
+    SUBDIRS += \
+        qbluetoothaddress \
+        qbluetoothdevicediscoveryagent \
+        qbluetoothdeviceinfo \
+        qbluetoothlocaldevice \
+        qbluetoothhostinfo \
+        qbluetoothservicediscoveryagent \
+        qbluetoothserviceinfo \
+        qbluetoothsocket \
+        qbluetoothtransfermanager \
+        qbluetoothtransferrequest \
+        qbluetoothuuid \
+        ql2capserver \
+        qrfcommserver
+}
 
-#!contains(QT_CONFIG, nfc): SUBDIRS -= \
-#    qndefmessage \
-#    qndefrecord \
-#    qnearfieldmanager \
-#    qnearfieldtagtype1 \
-#    qnearfieldtagtype2 \
-#
-## QTBUG-22015 these do not compile.
-#SUBDIRS -= \
-#    qnearfieldmanager \
-#    qnearfieldtagtype1 \
-#    qnearfieldtagtype2 \
+!isEmpty(QT.nfc.name) {
+    SUBDIRS += \
+        qndefmessage \
+        qndefrecord \
+        qnearfieldmanager \
+        qnearfieldtagtype1 \
+        qnearfieldtagtype2 \
+}
 
 qbluetoothservicediscoveryagent.CONFIG += no_check_target # QTBUG-22017
diff --git a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro
index 4d1d84b0..20772f6c 100644
--- a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro
+++ b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro
@@ -4,5 +4,28 @@ CONFIG += testcase
 
 QT = core nfc-private testlib
 
+INCLUDEPATH += ../../../src/nfc
+DEPENDPATH += ../../../src/nfc
+
+# This test includes source code from QtNfc library. Define the namespace which moc generated code
+# should be in.
+DEFINES += QT_BEGIN_MOC_NAMESPACE=\""namespace QtNfc {"\"
+DEFINES += QT_END_MOC_NAMESPACE=\""}"\"
+
+HEADERS += \
+    qnearfieldmanagervirtualbase_p.h \
+    qnearfieldmanager_emulator_p.h \
+    qnearfieldtarget_emulator_p.h \
+    targetemulator_p.h
+
+SOURCES += \
+    qnearfieldmanagervirtualbase.cpp \
+    qnearfieldmanager_emulator.cpp \
+    qnearfieldtarget_emulator.cpp \
+    targetemulator.cpp
+
 DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\"
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+# This test crashes
+CONFIG += insignificant_test
diff --git a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp
index b7acd820..92a4e99a 100644
--- a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp
+++ b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp
@@ -292,6 +292,12 @@ void tst_QNearFieldManager::registerNdefMessageHandler_filter()
     QVERIFY(target);
 }
 
-QTEST_MAIN(tst_QNearFieldManager);
+QTEST_MAIN(tst_QNearFieldManager)
+
+// Unset the moc namespace which is not required for the following include.
+#undef QT_BEGIN_MOC_NAMESPACE
+#define QT_BEGIN_MOC_NAMESPACE
+#undef QT_END_MOC_NAMESPACE
+#define QT_END_MOC_NAMESPACE
 
 #include "tst_qnearfieldmanager.moc"
diff --git a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro
index 63a59333..1b66692f 100644
--- a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro
+++ b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro
@@ -4,6 +4,28 @@ CONFIG += testcase
 
 QT = core nfc-private testlib
 
+INCLUDEPATH += ../../../src/nfc
+DEPENDPATH += ../../../src/nfc
+
+# This test includes source code from QtNfc library. Define the namespace which moc generated code
+# should be in.
+DEFINES += QT_BEGIN_MOC_NAMESPACE=\""namespace QtNfc {"\"
+DEFINES += QT_END_MOC_NAMESPACE=\""}"\"
+
+HEADERS += \
+    qnearfieldmanagervirtualbase_p.h \
+    qnearfieldmanager_emulator_p.h \
+    qnearfieldtarget_emulator_p.h \
+    targetemulator_p.h
+
+SOURCES += \
+    qnearfieldmanagervirtualbase.cpp \
+    qnearfieldmanager_emulator.cpp \
+    qnearfieldtarget_emulator.cpp \
+    targetemulator.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\"
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+# This test crashes
+CONFIG += insignificant_test
diff --git a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp
index 28839f19..36a8accf 100644
--- a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp
+++ b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp
@@ -484,6 +484,12 @@ void tst_QNearFieldTagType1::ndefMessages()
     }
 }
 
-QTEST_MAIN(tst_QNearFieldTagType1);
+QTEST_MAIN(tst_QNearFieldTagType1)
+
+// Unset the moc namespace which is not required for the following include.
+#undef QT_BEGIN_MOC_NAMESPACE
+#define QT_BEGIN_MOC_NAMESPACE
+#undef QT_END_MOC_NAMESPACE
+#define QT_END_MOC_NAMESPACE
 
 #include "tst_qnearfieldtagtype1.moc"
diff --git a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
index 77332b8e..0801a319 100644
--- a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
+++ b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
@@ -4,5 +4,28 @@ CONFIG += testcase
 
 QT = core nfc-private testlib
 
+INCLUDEPATH += ../../../src/nfc
+DEPENDPATH += ../../../src/nfc
+
+# This test includes source code from QtNfc library. Define the namespace which moc generated code
+# should be in.
+DEFINES += QT_BEGIN_MOC_NAMESPACE=\""namespace QtNfc {"\"
+DEFINES += QT_END_MOC_NAMESPACE=\""}"\"
+
+HEADERS += \
+    qnearfieldmanagervirtualbase_p.h \
+    qnearfieldtarget_emulator_p.h \
+    qnearfieldmanager_emulator_p.h \
+    targetemulator_p.h
+
+SOURCES += \
+    qnearfieldmanagervirtualbase.cpp \
+    qnearfieldtarget_emulator.cpp \
+    qnearfieldmanager_emulator.cpp \
+    targetemulator.cpp
+
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+# This test crashes
+CONFIG += insignificant_test
diff --git a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp
index 70fcf9e6..c18d0291 100644
--- a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp
+++ b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp
@@ -351,6 +351,12 @@ void tst_QNearFieldTagType2::ndefMessages()
     }
 }
 
-QTEST_MAIN(tst_QNearFieldTagType2);
+QTEST_MAIN(tst_QNearFieldTagType2)
+
+// Unset the moc namespace which is not required for the following include.
+#undef QT_BEGIN_MOC_NAMESPACE
+#define QT_BEGIN_MOC_NAMESPACE
+#undef QT_END_MOC_NAMESPACE
+#define QT_END_MOC_NAMESPACE
 
 #include "tst_qnearfieldtagtype2.moc"
diff --git a/tests/tests.pro b/tests/tests.pro
index f00a536e..6fa5383b 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,9 +1,8 @@
 TEMPLATE = subdirs
 SUBDIRS += auto
 
-# NFC disabled
-#SUBDIRS += nfctestserver
-
 linux*:!linux-armcc:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) {
     SUBDIRS += btclient
 }
+
+!isEmpty(QT.nfc.name):SUBDIRS += nfctestserver