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>

23 files changed, 58 insertions, 41 deletions

diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro
index 58ea1c06..9d74ac04 100644
--- a/src/nfc/nfc.pro
+++ b/src/nfc/nfc.pro
@@ -3,6 +3,11 @@ QT = core
 
 load(qt_module)
 
+# All classes in this module are in the QtNfc namespace.  Define the namespace which moc generated
+# code will be in.
+DEFINES += QT_BEGIN_MOC_NAMESPACE=\""namespace QtNfc {"\"
+DEFINES += QT_END_MOC_NAMESPACE=\""}"\"
+
 PUBLIC_HEADERS += \
     qnearfieldmanager.h \
     qnearfieldtarget.h \
@@ -119,7 +124,7 @@ simulator {
 }
 
 isEmpty(NFC_BACKEND_AVAILABLE) {
-    # unsupported platform stub
+    message("Unsupported NFC platform, will not build a working QtNfc library.")
 
     PRIVATE_HEADERS += \
         qllcpsocket_p.h \
diff --git a/src/nfc/qdeclarativendefrecord.cpp b/src/nfc/qdeclarativendefrecord.cpp
index 66e6cbc9..61abd002 100644
--- a/src/nfc/qdeclarativendefrecord.cpp
+++ b/src/nfc/qdeclarativendefrecord.cpp
@@ -271,6 +271,4 @@ void QDeclarativeNdefRecord::setRecord(const QNdefRecord &record)
     d->record = record;
 }
 
-#include "moc_qdeclarativendefrecord.cpp"
-
 QTNFC_END_NAMESPACE
diff --git a/src/nfc/qllcpserver.cpp b/src/nfc/qllcpserver.cpp
index f63f4c6d..17a34e1a 100644
--- a/src/nfc/qllcpserver.cpp
+++ b/src/nfc/qllcpserver.cpp
@@ -198,6 +198,4 @@ QLlcpSocket::SocketError QLlcpServer::serverError() const
     return d->serverError();
 }
 
-#include "moc_qllcpserver.cpp"
-
 QTNFC_END_NAMESPACE
diff --git a/src/nfc/qllcpserver_maemo6_p.cpp b/src/nfc/qllcpserver_maemo6_p.cpp
index fe3dde33..894bd4f6 100644
--- a/src/nfc/qllcpserver_maemo6_p.cpp
+++ b/src/nfc/qllcpserver_maemo6_p.cpp
@@ -198,5 +198,3 @@ void QLlcpServerPrivate::Socket(const QDBusVariant &lsap, int fd, const QVariant
 }
 
 QTNFC_END_NAMESPACE
-
-#include "moc_qllcpserver_maemo6_p.cpp"
diff --git a/src/nfc/qllcpsocket.cpp b/src/nfc/qllcpsocket.cpp
index b17d7573..dc4357ae 100644
--- a/src/nfc/qllcpsocket.cpp
+++ b/src/nfc/qllcpsocket.cpp
@@ -400,6 +400,4 @@ qint64 QLlcpSocket::writeData(const char *data, qint64 len)
     return d->writeData(data, len);
 }
 
-#include <moc_qllcpsocket.cpp>
-
 QTNFC_END_NAMESPACE
diff --git a/src/nfc/qllcpsocket_maemo6_p.cpp b/src/nfc/qllcpsocket_maemo6_p.cpp
index ef94776e..9a802bc1 100644
--- a/src/nfc/qllcpsocket_maemo6_p.cpp
+++ b/src/nfc/qllcpsocket_maemo6_p.cpp
@@ -637,6 +637,4 @@ void QLlcpSocketPrivate::initializeRequestor()
     }
 }
 
-#include "moc_qllcpsocket_maemo6_p.cpp"
-
 QTNFC_END_NAMESPACE
diff --git a/src/nfc/qnearfieldmanager.cpp b/src/nfc/qnearfieldmanager.cpp
index 108c2f69..6c6b1dd1 100644
--- a/src/nfc/qnearfieldmanager.cpp
+++ b/src/nfc/qnearfieldmanager.cpp
@@ -440,7 +440,4 @@ QNearFieldManager::TargetAccessModes QNearFieldManager::targetAccessModes() cons
     return d->m_requestedModes;
 }
 
-#include "moc_qnearfieldmanager.cpp"
-#include "moc_qnearfieldmanager_p.cpp"
-
 QTNFC_END_NAMESPACE
diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h
index 15b87a05..2cf88968 100644
--- a/src/nfc/qnearfieldmanager.h
+++ b/src/nfc/qnearfieldmanager.h
@@ -58,6 +58,7 @@ class QNearFieldManagerPrivate;
 class Q_NFC_EXPORT QNearFieldManager : public QObject
 {
     Q_OBJECT
+
     Q_DECLARE_PRIVATE(QNearFieldManager)
 
 public:
diff --git a/src/nfc/qnearfieldmanager_emulator.cpp b/src/nfc/qnearfieldmanager_emulator.cpp
index 0b973679..82c29f82 100644
--- a/src/nfc/qnearfieldmanager_emulator.cpp
+++ b/src/nfc/qnearfieldmanager_emulator.cpp
@@ -47,6 +47,8 @@
 
 #include <QtCore/QDebug>
 
+QTNFC_BEGIN_NAMESPACE
+
 QNearFieldManagerPrivateImpl::QNearFieldManagerPrivateImpl()
 {
     TagActivator *tagActivator = TagActivator::instance();
@@ -99,4 +101,4 @@ void QNearFieldManagerPrivateImpl::tagDeactivated(TagBase *tag)
     targetDeactivated(target);
 }
 
-
+QTNFC_END_NAMESPACE
diff --git a/src/nfc/qnearfieldmanager_emulator_p.h b/src/nfc/qnearfieldmanager_emulator_p.h
index e9e335cc..e125f4c9 100644
--- a/src/nfc/qnearfieldmanager_emulator_p.h
+++ b/src/nfc/qnearfieldmanager_emulator_p.h
@@ -49,6 +49,10 @@
 #include <QtCore/QObject>
 #include <QtCore/QWeakPointer>
 
+QT_BEGIN_HEADER
+
+QTNFC_BEGIN_NAMESPACE
+
 class TagBase;
 class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivateVirtualBase
 {
@@ -73,4 +77,8 @@ private:
 
 };
 
+QTNFC_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif // QNEARFIELDMANAGER_EMULATOR_H
diff --git a/src/nfc/qnearfieldmanager_maemo6.cpp b/src/nfc/qnearfieldmanager_maemo6.cpp
index f6c94ccd..42ebb33b 100644
--- a/src/nfc/qnearfieldmanager_maemo6.cpp
+++ b/src/nfc/qnearfieldmanager_maemo6.cpp
@@ -448,6 +448,4 @@ void QNearFieldManagerPrivateImpl::_q_targetLost(const QDBusObjectPath &targetPa
         emit targetLost(nearFieldTarget);
 }
 
-#include "moc_qnearfieldmanager_maemo6_p.cpp"
-
 QTNFC_END_NAMESPACE
diff --git a/src/nfc/qnearfieldmanager_simulator.cpp b/src/nfc/qnearfieldmanager_simulator.cpp
index 442a3705..18cb6e33 100644
--- a/src/nfc/qnearfieldmanager_simulator.cpp
+++ b/src/nfc/qnearfieldmanager_simulator.cpp
@@ -202,7 +202,6 @@ void QNearFieldManagerPrivateImpl::targetLeavingProximity(const QByteArray &uid)
     targetDeactivated(target);
 }
 
-#include "qnearfieldmanager_simulator.moc"
-#include "moc_qnearfieldmanager_simulator_p.cpp"
-
 QTNFC_END_NAMESPACE
+
+#include "qnearfieldmanager_simulator.moc"
diff --git a/src/nfc/qnearfieldmanagerimpl_p.cpp b/src/nfc/qnearfieldmanagerimpl_p.cpp
index c4fd68e8..28fe62fe 100644
--- a/src/nfc/qnearfieldmanagerimpl_p.cpp
+++ b/src/nfc/qnearfieldmanagerimpl_p.cpp
@@ -58,6 +58,5 @@ QNearFieldManagerPrivateImpl::QNearFieldManagerPrivateImpl()
 QNearFieldManagerPrivateImpl::~QNearFieldManagerPrivateImpl()
 {
 }
-//#include "moc_qnearfieldmanagerimpl_p.cpp"
 
 QTNFC_END_NAMESPACE
diff --git a/src/nfc/qnearfieldmanagervirtualbase.cpp b/src/nfc/qnearfieldmanagervirtualbase.cpp
index f343f1c5..ffafa281 100644
--- a/src/nfc/qnearfieldmanagervirtualbase.cpp
+++ b/src/nfc/qnearfieldmanagervirtualbase.cpp
@@ -214,6 +214,4 @@ void QNearFieldManagerPrivateVirtualBase::ndefReceived(const QNdefMessage &messa
     }
 }
 
-#include "moc_qnearfieldmanagervirtualbase_p.cpp"
-
 QTNFC_END_NAMESPACE
diff --git a/src/nfc/qnearfieldtagtype1.cpp b/src/nfc/qnearfieldtagtype1.cpp
index fca7b7d9..28477c90 100644
--- a/src/nfc/qnearfieldtagtype1.cpp
+++ b/src/nfc/qnearfieldtagtype1.cpp
@@ -733,6 +733,4 @@ bool QNearFieldTagType1::handleResponse(const QNearFieldTarget::RequestId &id,
     return handled;
 }
 
-#include "moc_qnearfieldtagtype1.cpp"
-
 QTNFC_END_NAMESPACE
diff --git a/src/nfc/qnearfieldtagtype2.cpp b/src/nfc/qnearfieldtagtype2.cpp
index 8c02d780..1add9b78 100644
--- a/src/nfc/qnearfieldtagtype2.cpp
+++ b/src/nfc/qnearfieldtagtype2.cpp
@@ -346,6 +346,4 @@ void QNearFieldTagType2::timerEvent(QTimerEvent *event)
     }
 }
 
-#include "moc_qnearfieldtagtype2.cpp"
-
 QTNFC_END_NAMESPACE
diff --git a/src/nfc/qnearfieldtagtype3.cpp b/src/nfc/qnearfieldtagtype3.cpp
index 4783dd06..aafd123c 100644
--- a/src/nfc/qnearfieldtagtype3.cpp
+++ b/src/nfc/qnearfieldtagtype3.cpp
@@ -183,6 +183,4 @@ bool QNearFieldTagType3::handleResponse(const QNearFieldTarget::RequestId &id,
     return QNearFieldTarget::handleResponse(id, response);
 }
 
-#include "moc_qnearfieldtagtype3.cpp"
-
 QTNFC_END_NAMESPACE
diff --git a/src/nfc/qnearfieldtagtype4.cpp b/src/nfc/qnearfieldtagtype4.cpp
index f165de1c..8b94e639 100644
--- a/src/nfc/qnearfieldtagtype4.cpp
+++ b/src/nfc/qnearfieldtagtype4.cpp
@@ -159,6 +159,4 @@ bool QNearFieldTagType4::handleResponse(const QNearFieldTarget::RequestId &id,
     return QNearFieldTarget::handleResponse(id, response);
 }
 
-#include "moc_qnearfieldtagtype4.cpp"
-
 QTNFC_END_NAMESPACE
diff --git a/src/nfc/qnearfieldtarget.cpp b/src/nfc/qnearfieldtarget.cpp
index 7ce86974..d519eab3 100644
--- a/src/nfc/qnearfieldtarget.cpp
+++ b/src/nfc/qnearfieldtarget.cpp
@@ -457,6 +457,4 @@ bool QNearFieldTarget::handleResponse(const QNearFieldTarget::RequestId &id,
     return true;
 }
 
-#include "moc_qnearfieldtarget.cpp"
-
 QTNFC_END_NAMESPACE
diff --git a/src/nfc/qnearfieldtarget_emulator.cpp b/src/nfc/qnearfieldtarget_emulator.cpp
index 3661ea2a..a4bd888c 100644
--- a/src/nfc/qnearfieldtarget_emulator.cpp
+++ b/src/nfc/qnearfieldtarget_emulator.cpp
@@ -48,13 +48,12 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDateTime>
 
-#include <QtCore/QDebug>
+QTNFC_BEGIN_NAMESPACE
 
 static QMutex tagMutex;
 static QMap<TagBase *, bool> tagMap;
 static TagActivator tagActivator;
 
-
 TagType1::TagType1(TagBase *tag, QObject *parent)
 :   QNearFieldTagType1(parent), m_tag(tag)
 {
@@ -226,13 +225,11 @@ void TagActivator::initialize()
         target.endGroup();
 
         if (tagType == QLatin1String("TagType1")) {
-            qDebug() << "loading" << targetFilename << "as NfcTagType1";
             NfcTagType1 *tag = new NfcTagType1;
             tag->load(&target);
 
             tagMap.insert(tag, false);
         } else if (tagType == QLatin1String("TagType2")) {
-            qDebug() << "loading" << targetFilename << "as NfcTagType2";
             NfcTagType2 *tag = new NfcTagType2;
             tag->load(&target);
 
@@ -277,8 +274,10 @@ void TagActivator::timerEvent(QTimerEvent *e)
 
         *m_current = false;
 
+        TagBase *tag = m_current.key();
+
         tagMutex.unlock();
-        emit tagDeactivated(m_current.key());
+        emit tagDeactivated(tag);
         tagMutex.lock();
     }
 
@@ -289,12 +288,14 @@ void TagActivator::timerEvent(QTimerEvent *e)
     if (m_current != tagMap.end()) {
         *m_current = true;
 
-        tagMutex.unlock();
+        TagBase *tag = m_current.key();
 
-        emit tagActivated(m_current.key());
+        tagMutex.unlock();
+        emit tagActivated(tag);
         tagMutex.lock();
     }
 
     tagMutex.unlock();
 }
 
+QTNFC_END_NAMESPACE
diff --git a/src/nfc/qnearfieldtarget_emulator_p.h b/src/nfc/qnearfieldtarget_emulator_p.h
index 42002693..10b42fb7 100644
--- a/src/nfc/qnearfieldtarget_emulator_p.h
+++ b/src/nfc/qnearfieldtarget_emulator_p.h
@@ -48,6 +48,10 @@
 
 #include <QtCore/QMap>
 
+QT_BEGIN_HEADER
+
+QTNFC_BEGIN_NAMESPACE
+
 class TagType1 : public QNearFieldTagType1
 {
     Q_OBJECT
@@ -111,4 +115,8 @@ private:
     int timerId;
 };
 
+QTNFC_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif // QNEARFIELDTARGET_EMULATOR_P_H
diff --git a/src/nfc/targetemulator.cpp b/src/nfc/targetemulator.cpp
index e9f3741e..a374f521 100644
--- a/src/nfc/targetemulator.cpp
+++ b/src/nfc/targetemulator.cpp
@@ -49,6 +49,8 @@
 // Implementation of qNfcChecksum
 #include "checksum_p.h"
 
+QTNFC_BEGIN_NAMESPACE
+
 TagBase::TagBase()
 :   lastAccess(0)
 {
@@ -71,6 +73,10 @@ NfcTagType1::NfcTagType1()
     memory[(0x0e << 3) | 0x01] = 0x60;
 }
 
+NfcTagType1::~NfcTagType1()
+{
+}
+
 void NfcTagType1::load(QSettings *settings)
 {
     settings->beginGroup(QLatin1String("TagType1"));
@@ -290,6 +296,10 @@ NfcTagType2::NfcTagType2()
 {
 }
 
+NfcTagType2::~NfcTagType2()
+{
+}
+
 void NfcTagType2::load(QSettings *settings)
 {
     settings->beginGroup(QLatin1String("TagType2"));
@@ -380,3 +390,5 @@ QByteArray NfcTagType2::processCommand(const QByteArray &command)
 
     return response;
 }
+
+QTNFC_END_NAMESPACE
diff --git a/src/nfc/targetemulator_p.h b/src/nfc/targetemulator_p.h
index 1d6438a8..0ac6121a 100644
--- a/src/nfc/targetemulator_p.h
+++ b/src/nfc/targetemulator_p.h
@@ -44,14 +44,19 @@
 
 #include <QtCore/QtGlobal>
 #include <QtCore/QByteArray>
+#include <QtNfc/qnfcglobal.h>
 
 QT_FORWARD_DECLARE_CLASS(QSettings)
 
+QT_BEGIN_HEADER
+
+QTNFC_BEGIN_NAMESPACE
+
 class TagBase
 {
 public:
     TagBase();
-    ~TagBase();
+    virtual ~TagBase();
 
     virtual void load(QSettings *settings) = 0;
 
@@ -104,4 +109,8 @@ private:
     bool expectPacket2;
 };
 
+QTNFC_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif // TARGETEMULATOR_P_H