Don't export QNearFieldTagType* classes.

There is no implementation for them at this stage. Hence we remove them
from the committed API. They remain enabled via auto tests to
ensure that the code keeps working.

Task-number: QTBUG-32306
Change-Id: I5312e8436a99be4e24311bea4c92718239178ef4
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Michael Zanetti <michael.zanetti@canonical.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

14 files changed, 69 insertions, 21 deletions

diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro
index 61c63a68..7313b327 100644
--- a/src/nfc/nfc.pro
+++ b/src/nfc/nfc.pro
@@ -15,11 +15,7 @@ PUBLIC_HEADERS += \
     qndefmessage.h \
     qndeffilter.h \
     qndefnfcurirecord.h \
-    qnearfieldtagtype1.h \
-    qnearfieldtagtype2.h \
     qllcpsocket.h \
-    qnearfieldtagtype3.h \
-    qnearfieldtagtype4.h \
     qllcpserver.h \
     qdeclarativendefrecord.h \
     qndefnfcsmartposterrecord.h
@@ -28,6 +24,10 @@ PRIVATE_HEADERS += \
     qndefrecord_p.h \
     qnearfieldtarget_p.h \
     qnearfieldmanager_p.h \
+    qnearfieldtagtype1_p.h \
+    qnearfieldtagtype2_p.h \
+    qnearfieldtagtype3_p.h \
+    qnearfieldtagtype4_p.h \
     qtlv_p.h \
     checksum_p.h \
     qndefnfcsmartposterrecord_p.h
diff --git a/src/nfc/qnearfieldmanager_maemo6.cpp b/src/nfc/qnearfieldmanager_maemo6.cpp
index 9e8b9445..81f1266c 100644
--- a/src/nfc/qnearfieldmanager_maemo6.cpp
+++ b/src/nfc/qnearfieldmanager_maemo6.cpp
@@ -48,7 +48,7 @@
 #include "ndefhandler_adaptor.h"
 #include "accessrequestor_adaptor.h"
 
-#include <qnearfieldtagtype1.h>
+#include <qnearfieldtagtype1_p.h>
 
 #include <QtDBus/QDBusConnection>
 
diff --git a/src/nfc/qnearfieldmanager_simulator.cpp b/src/nfc/qnearfieldmanager_simulator.cpp
index 64b7ce72..9a0d0576 100644
--- a/src/nfc/qnearfieldmanager_simulator.cpp
+++ b/src/nfc/qnearfieldmanager_simulator.cpp
@@ -42,7 +42,7 @@
 #include "qnearfieldmanager_simulator_p.h"
 #include "qnearfieldmanager.h"
 #include "qnearfieldtarget_p.h"
-#include "qnearfieldtagtype1.h"
+#include "qnearfieldtagtype1_p.h"
 #include "qndefmessage.h"
 
 #include <mobilityconnection_p.h>
diff --git a/src/nfc/qnearfieldtagtype1.cpp b/src/nfc/qnearfieldtagtype1.cpp
index 51a616a2..4d652b14 100644
--- a/src/nfc/qnearfieldtagtype1.cpp
+++ b/src/nfc/qnearfieldtagtype1.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qnearfieldtagtype1.h"
+#include "qnearfieldtagtype1_p.h"
 #include "qnearfieldtarget_p.h"
 #include "qndefmessage.h"
 #include "qtlv_p.h"
@@ -58,6 +58,7 @@ QT_BEGIN_NAMESPACE_NFC
 
     \ingroup connectivity-nfc
     \inmodule QtNfc
+    \internal
 */
 
 /*!
diff --git a/src/nfc/qnearfieldtagtype1.h b/src/nfc/qnearfieldtagtype1_p.h
index 03660b18..41225227 100644
--- a/src/nfc/qnearfieldtagtype1.h
+++ b/src/nfc/qnearfieldtagtype1_p.h
@@ -42,13 +42,24 @@
 #ifndef QNEARFIELDTAGTYPE1_H
 #define QNEARFIELDTAGTYPE1_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtNfc/QNearFieldTarget>
 
 QT_BEGIN_NAMESPACE_NFC
 
 class QNearFieldTagType1Private;
 
-class Q_NFC_EXPORT QNearFieldTagType1 : public QNearFieldTarget
+class Q_AUTOTEST_EXPORT QNearFieldTagType1 : public QNearFieldTarget
 {
     Q_OBJECT
 
diff --git a/src/nfc/qnearfieldtagtype2.cpp b/src/nfc/qnearfieldtagtype2.cpp
index 91ed9cca..dadf67f8 100644
--- a/src/nfc/qnearfieldtagtype2.cpp
+++ b/src/nfc/qnearfieldtagtype2.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qnearfieldtagtype2.h"
+#include "qnearfieldtagtype2_p.h"
 #include "qnearfieldtarget_p.h"
 
 #include <QtCore/QVariant>
@@ -57,6 +57,7 @@ QT_BEGIN_NAMESPACE_NFC
 
     \ingroup connectivity-nfc
     \inmodule QtNfc
+    \internal
 */
 
 /*!
diff --git a/src/nfc/qnearfieldtagtype2.h b/src/nfc/qnearfieldtagtype2_p.h
index 6b8c2315..6a429722 100644
--- a/src/nfc/qnearfieldtagtype2.h
+++ b/src/nfc/qnearfieldtagtype2_p.h
@@ -42,13 +42,24 @@
 #ifndef QNEARFIELDTAGTYPE2_H
 #define QNEARFIELDTAGTYPE2_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtNfc/QNearFieldTarget>
 
 QT_BEGIN_NAMESPACE_NFC
 
 class QNearFieldTagType2Private;
 
-class Q_NFC_EXPORT QNearFieldTagType2 : public QNearFieldTarget
+class Q_AUTOTEST_EXPORT QNearFieldTagType2 : public QNearFieldTarget
 {
     Q_OBJECT
 
diff --git a/src/nfc/qnearfieldtagtype3.cpp b/src/nfc/qnearfieldtagtype3.cpp
index 15823328..e13cf5c4 100644
--- a/src/nfc/qnearfieldtagtype3.cpp
+++ b/src/nfc/qnearfieldtagtype3.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qnearfieldtagtype3.h"
+#include "qnearfieldtagtype3_p.h"
 
 QT_BEGIN_NAMESPACE_NFC
 
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE_NFC
 
     \ingroup connectivity-nfc
     \inmodule QtNfc
+    \internal
 */
 
 /*!
diff --git a/src/nfc/qnearfieldtagtype3.h b/src/nfc/qnearfieldtagtype3_p.h
index e2a44381..1ee94f53 100644
--- a/src/nfc/qnearfieldtagtype3.h
+++ b/src/nfc/qnearfieldtagtype3_p.h
@@ -42,13 +42,24 @@
 #ifndef QNEARFIELDTAGTYPE3_H
 #define QNEARFIELDTAGTYPE3_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/QList>
 #include <QtCore/QMap>
 #include <QtNfc/QNearFieldTarget>
 
 QT_BEGIN_NAMESPACE_NFC
 
-class Q_NFC_EXPORT QNearFieldTagType3 : public QNearFieldTarget
+class Q_AUTOTEST_EXPORT QNearFieldTagType3 : public QNearFieldTarget
 {
     Q_OBJECT
 
diff --git a/src/nfc/qnearfieldtagtype4.cpp b/src/nfc/qnearfieldtagtype4.cpp
index 544b9bd6..12b02e10 100644
--- a/src/nfc/qnearfieldtagtype4.cpp
+++ b/src/nfc/qnearfieldtagtype4.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qnearfieldtagtype4.h"
+#include "qnearfieldtagtype4_p.h"
 
 QT_BEGIN_NAMESPACE_NFC
 
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE_NFC
 
     \ingroup connectivity-nfc
     \inmodule QtNfc
+    \internal
 */
 
 /*!
diff --git a/src/nfc/qnearfieldtagtype4.h b/src/nfc/qnearfieldtagtype4_p.h
index 8632b92b..66a25ef3 100644
--- a/src/nfc/qnearfieldtagtype4.h
+++ b/src/nfc/qnearfieldtagtype4_p.h
@@ -44,9 +44,20 @@
 
 #include <QtNfc/QNearFieldTarget>
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 QT_BEGIN_NAMESPACE_NFC
 
-class Q_NFC_EXPORT QNearFieldTagType4 : public QNearFieldTarget
+class Q_AUTOTEST_EXPORT QNearFieldTagType4 : public QNearFieldTarget
 {
     Q_OBJECT
 
diff --git a/src/nfc/qnearfieldtarget_emulator_p.h b/src/nfc/qnearfieldtarget_emulator_p.h
index de8edd81..6ed86260 100644
--- a/src/nfc/qnearfieldtarget_emulator_p.h
+++ b/src/nfc/qnearfieldtarget_emulator_p.h
@@ -42,8 +42,8 @@
 #ifndef QNEARFIELDTARGET_EMULATOR_P_H
 #define QNEARFIELDTARGET_EMULATOR_P_H
 
-#include "qnearfieldtagtype1.h"
-#include "qnearfieldtagtype2.h"
+#include "qnearfieldtagtype1_p.h"
+#include "qnearfieldtagtype2_p.h"
 #include "targetemulator_p.h"
 
 #include <QtCore/QMap>
diff --git a/src/nfc/qnearfieldtarget_maemo6_p.h b/src/nfc/qnearfieldtarget_maemo6_p.h
index 680066c8..793b75f5 100644
--- a/src/nfc/qnearfieldtarget_maemo6_p.h
+++ b/src/nfc/qnearfieldtarget_maemo6_p.h
@@ -48,10 +48,10 @@
 
 #include <qnearfieldtarget.h>
 #include <qnearfieldtarget_p.h>
-#include <qnearfieldtagtype1.h>
-#include <qnearfieldtagtype2.h>
-#include <qnearfieldtagtype3.h>
-#include <qnearfieldtagtype4.h>
+#include <qnearfieldtagtype1_p.h>
+#include <qnearfieldtagtype2_p.h>
+#include <qnearfieldtagtype3_p.h>
+#include <qnearfieldtagtype4_p.h>
 #include <qndefmessage.h>
 
 #include "maemo6/adapter_interface_p.h"
diff --git a/src/nfc/qtlv.cpp b/src/nfc/qtlv.cpp
index 2a83902e..efc11152 100644
--- a/src/nfc/qtlv.cpp
+++ b/src/nfc/qtlv.cpp
@@ -41,7 +41,7 @@
 
 #include "qtlv_p.h"
 
-#include "qnearfieldtagtype1.h"
+#include "qnearfieldtagtype1_p.h"
 
 #include <QtCore/QVariant>