Remove/disable QtNFC from Qt 5.0.

Currently there is no way of verifying the QtNFC API. This decision will
be revisited by future Qt releases. Furthermore there will be no
commitment that the re-enabled QtNFC API will be source or binary
compatible to the version disabled by this commit.

Change-Id: I9aea986189d48b5c2368ce6b2c7ff20e2c94f2f8
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Oliver Woltermann <oliver.woltermann@nokia.com>

8 files changed, 69 insertions, 48 deletions

diff --git a/doc/qt5-dita.qdocconf b/doc/qt5-dita.qdocconf
index e6f24dc3..39bd1007 100644
--- a/doc/qt5-dita.qdocconf
+++ b/doc/qt5-dita.qdocconf
@@ -7,9 +7,14 @@ project = qtconnectivity
 # Images should be placed in <rootdir>/dic/images and examples in
 # <rootdir>/examples.
 # Paths are relative to the  location of this file.
-exampledirs += .
-headerdirs += ..
-sourcedirs += ..
+exampledirs +=  ../examples
+headerdirs +=   ../src/bluetooth ../src/imports/bluetooth
+imagedirs +=    src/images
+sourcedirs +=   ../src/bluetooth \
+                ../src/imports/bluetooth \
+                src
+excludedirs +=  ../tests
+
 
 
 
diff --git a/doc/qt5.qdocconf b/doc/qt5.qdocconf
index 138a7948..4d47b68c 100644
--- a/doc/qt5.qdocconf
+++ b/doc/qt5.qdocconf
@@ -12,11 +12,13 @@ include(macros.qdocconf)
 # Images should be placed in <rootdir>/dic/images and examples in
 # <rootdir>/examples.
 # Paths are relative to the  location of this file.
-exampledirs += ../examples/ ../demos/
-headerdirs += ..
-imagedirs += src/images
-sourcedirs += ..
-excludedirs += ../tests
+exampledirs +=  ../examples
+headerdirs +=   ../src/bluetooth ../src/imports/bluetooth
+imagedirs +=    src/images
+sourcedirs +=   ../src/bluetooth \
+                ../src/imports/bluetooth \
+                src
+excludedirs +=  ../tests
 
 # The following parameters are for creating a qhp file, the qhelpgenerator
 # program can convert the qhp file into a qch file which can be opened in
diff --git a/modules/qt_nfc.pri b/modules/qt_nfc.pri
index 47becc30..5d07df1b 100644
--- a/modules/qt_nfc.pri
+++ b/modules/qt_nfc.pri
@@ -1,17 +1,19 @@
-QT.nfc.VERSION = 5.0.0
-QT.nfc.MAJOR_VERSION = 5
-QT.nfc.MINOR_VERSION = 0
-QT.nfc.PATCH_VERSION = 0
+# QT NFC disabled
 
-QT.nfc.name = QtNfc
-QT.nfc.bins = $$QT_MODULE_BIN_BASE
-QT.nfc.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtNfc
-QT.nfc.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNfc/$$QT.nfc.VERSION
-QT.nfc.sources = $$QT_MODULE_BASE/src/nfc
-QT.nfc.libs = $$QT_MODULE_LIB_BASE
-QT.nfc.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.nfc.imports = $$QT_MODULE_IMPORT_BASE
-QT.nfc.depends = core
-QT.nfc.DEFINES = QT_NFC_LIB
-
-QT_CONFIG += nfc
+#QT.nfc.VERSION = 5.0.0
+#QT.nfc.MAJOR_VERSION = 5
+#QT.nfc.MINOR_VERSION = 0
+#QT.nfc.PATCH_VERSION = 0
+#
+#QT.nfc.name = QtNfc
+#QT.nfc.bins = $$QT_MODULE_BIN_BASE
+#QT.nfc.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtNfc
+#QT.nfc.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNfc/$$QT.nfc.VERSION
+#QT.nfc.sources = $$QT_MODULE_BASE/src/nfc
+#QT.nfc.libs = $$QT_MODULE_LIB_BASE
+#QT.nfc.plugins = $$QT_MODULE_PLUGIN_BASE
+#QT.nfc.imports = $$QT_MODULE_IMPORT_BASE
+#QT.nfc.depends = core
+#QT.nfc.DEFINES = QT_NFC_LIB
+#
+#QT_CONFIG += nfc
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index f1072841..7403281d 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,2 +1,5 @@
 TEMPLATE = subdirs
-SUBDIRS += bluetooth nfc
+SUBDIRS += bluetooth
+
+#The Qt NFC module is currently not supported
+#SUBDIRS += nfc
diff --git a/src/src.pro b/src/src.pro
index 040da1fd..4f20fe20 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,3 +1,9 @@
 TEMPLATE = subdirs
 CONFIG  += ordered
-SUBDIRS = bluetooth nfc imports
+
+SUBDIRS = bluetooth
+
+#The Qt NFC module is currently not supported
+#SUBDIRS += nfc
+
+SUBDIRS += imports
diff --git a/sync.profile b/sync.profile
index e87236d4..439903e8 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,20 +1,20 @@
 %modules = ( # path to module name map
     "QtBluetooth" => "$basedir/src/bluetooth",
-    "QtNfc" => "$basedir/src/nfc",
+#    "QtNfc" => "$basedir/src/nfc",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
 %classnames = (
     "qtbluetoothversion.h" => "QtBluetoothVersion",
-    "qtnfcversion.h" => "QtNfcVersion",
+#    "qtnfcversion.h" => "QtNfcVersion",
 );
 %mastercontent = (
     "bluetooth" => "#include <QtBluetooth/QtBluetooth>\n",
-    "nfc" => "#include <QtNfc/QtNfc>\n",
+#    "nfc" => "#include <QtNfc/QtNfc>\n",
 );
 %modulepris = (
     "QtBluetooth" => "$basedir/modules/qt_bluetooth.pri",
-    "QtNfc" => "$basedir/modules/qt_nfc.pri",
+#    "QtNfc" => "$basedir/modules/qt_nfc.pri",
 );
 # Module dependencies.
 # Every module that is required to build this module should have one entry.
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 1f1b12cb..f3f773df 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -12,11 +12,11 @@ SUBDIRS += \
     qbluetoothtransferrequest \
     qbluetoothuuid \
     ql2capserver \
-    qndefmessage \
-    qndefrecord \
-    qnearfieldmanager \
-    qnearfieldtagtype1 \
-    qnearfieldtagtype2 \
+#    qndefmessage \
+#    qndefrecord \
+#    qnearfieldmanager \
+#    qnearfieldtagtype1 \
+#    qnearfieldtagtype2 \
     qrfcommserver \
 
 !contains(QT_CONFIG, bluetooth): SUBDIRS -= \
@@ -32,16 +32,16 @@ SUBDIRS += \
     qbluetoothuuid \
     ql2capserver \
 
-!contains(QT_CONFIG, nfc): SUBDIRS -= \
-    qndefmessage \
-    qndefrecord \
-    qnearfieldmanager \
-    qnearfieldtagtype1 \
-    qnearfieldtagtype2 \
-
-# QTBUG-22015 these do not compile.
-SUBDIRS -= \
-    qnearfieldmanager \
-    qnearfieldtagtype1 \
-    qnearfieldtagtype2 \
+#!contains(QT_CONFIG, nfc): SUBDIRS -= \
+#    qndefmessage \
+#    qndefrecord \
+#    qnearfieldmanager \
+#    qnearfieldtagtype1 \
+#    qnearfieldtagtype2 \
+#
+## QTBUG-22015 these do not compile.
+#SUBDIRS -= \
+#    qnearfieldmanager \
+#    qnearfieldtagtype1 \
+#    qnearfieldtagtype2 \
 
diff --git a/tests/tests.pro b/tests/tests.pro
index 3b5abbad..f00a536e 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,5 +1,8 @@
 TEMPLATE = subdirs
-SUBDIRS += auto nfctestserver
+SUBDIRS += auto
+
+# NFC disabled
+#SUBDIRS += nfctestserver
 
 linux*:!linux-armcc:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) {
     SUBDIRS += btclient