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>

5 files changed, 58 insertions, 57 deletions

diff --git a/src/imports/nfc/nfc.pro b/src/imports/nfc/nfc.pro
index 61b81c2c..bed94d5f 100644
--- a/src/imports/nfc/nfc.pro
+++ b/src/imports/nfc/nfc.pro
@@ -1,4 +1,4 @@
-QT += declarative nfc
+QT = core qml nfc
 
 # Input
 HEADERS += \
diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp
index 76c98836..3a42d181 100644
--- a/src/imports/nfc/plugin.cpp
+++ b/src/imports/nfc/plugin.cpp
@@ -39,12 +39,10 @@
 **
 ****************************************************************************/
 
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
 
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeExtensionPlugin>
-
-#include <qdeclarativendefrecord.h>
-
+#include "qdeclarativendefrecord.h"
 #include "qdeclarativenearfieldsocket_p.h"
 #include "qdeclarativenearfield_p.h"
 #include "qdeclarativendeffilter_p.h"
@@ -54,15 +52,19 @@
 
 QT_USE_NAMESPACE
 
-class QNfcQmlPlugin : public QDeclarativeExtensionPlugin
+class QNfcQmlPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
+
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
 public:
     void registerTypes(const char *uri)
     {
         Q_ASSERT(uri == QLatin1String("QtNfc"));
 
+        // @uri QtNfc
+
         int major = 5;
         int minor = 0;
         qmlRegisterType<QDeclarativeNearFieldSocket>(uri, major, minor, "NearFieldSocket");
diff --git a/src/imports/nfc/qdeclarativenearfield.cpp b/src/imports/nfc/qdeclarativenearfield.cpp
index ca46a880..6c9577a4 100644
--- a/src/imports/nfc/qdeclarativenearfield.cpp
+++ b/src/imports/nfc/qdeclarativenearfield.cpp
@@ -106,23 +106,23 @@ QDeclarativeNearField::QDeclarativeNearField(QObject *parent)
 {
 }
 
-QDeclarativeListProperty<QDeclarativeNdefRecord> QDeclarativeNearField::messageRecords()
+QQmlListProperty<QDeclarativeNdefRecord> QDeclarativeNearField::messageRecords()
 {
-    return QDeclarativeListProperty<QDeclarativeNdefRecord>(this, 0,
-                                                            &QDeclarativeNearField::append_messageRecord,
-                                                            &QDeclarativeNearField::count_messageRecords,
-                                                            &QDeclarativeNearField::at_messageRecord,
-                                                            &QDeclarativeNearField::clear_messageRecords);
+    return QQmlListProperty<QDeclarativeNdefRecord>(this, 0,
+                                                    &QDeclarativeNearField::append_messageRecord,
+                                                    &QDeclarativeNearField::count_messageRecords,
+                                                    &QDeclarativeNearField::at_messageRecord,
+                                                    &QDeclarativeNearField::clear_messageRecords);
 
 }
 
-QDeclarativeListProperty<QDeclarativeNdefFilter> QDeclarativeNearField::filter()
+QQmlListProperty<QDeclarativeNdefFilter> QDeclarativeNearField::filter()
 {
-    return QDeclarativeListProperty<QDeclarativeNdefFilter>(this, 0,
-                                                            &QDeclarativeNearField::append_filter,
-                                                            &QDeclarativeNearField::count_filters,
-                                                            &QDeclarativeNearField::at_filter,
-                                                            &QDeclarativeNearField::clear_filter);
+    return QQmlListProperty<QDeclarativeNdefFilter>(this, 0,
+                                                    &QDeclarativeNearField::append_filter,
+                                                    &QDeclarativeNearField::count_filters,
+                                                    &QDeclarativeNearField::at_filter,
+                                                    &QDeclarativeNearField::clear_filter);
 }
 
 bool QDeclarativeNearField::orderMatch() const
@@ -183,7 +183,7 @@ void QDeclarativeNearField::_q_handleNdefMessage(const QNdefMessage &message)
 {
     m_messageUpdating = true;
 
-    QDeclarativeListReference listRef(this, "messageRecords");
+    QQmlListReference listRef(this, "messageRecords");
 
     listRef.clear();
 
@@ -195,8 +195,8 @@ void QDeclarativeNearField::_q_handleNdefMessage(const QNdefMessage &message)
     emit messageRecordsChanged();
 }
 
-void QDeclarativeNearField::append_messageRecord(QDeclarativeListProperty<QDeclarativeNdefRecord> *list,
-                                           QDeclarativeNdefRecord *record)
+void QDeclarativeNearField::append_messageRecord(QQmlListProperty<QDeclarativeNdefRecord> *list,
+                                                 QDeclarativeNdefRecord *record)
 {
     QDeclarativeNearField *nearField = qobject_cast<QDeclarativeNearField *>(list->object);
     if (!nearField)
@@ -208,7 +208,7 @@ void QDeclarativeNearField::append_messageRecord(QDeclarativeListProperty<QDecla
         emit nearField->messageRecordsChanged();
 }
 
-int QDeclarativeNearField::count_messageRecords(QDeclarativeListProperty<QDeclarativeNdefRecord> *list)
+int QDeclarativeNearField::count_messageRecords(QQmlListProperty<QDeclarativeNdefRecord> *list)
 {
     QDeclarativeNearField *nearField = qobject_cast<QDeclarativeNearField *>(list->object);
     if (!nearField)
@@ -217,8 +217,8 @@ int QDeclarativeNearField::count_messageRecords(QDeclarativeListProperty<QDeclar
     return nearField->m_message.count();
 }
 
-QDeclarativeNdefRecord *QDeclarativeNearField::at_messageRecord(QDeclarativeListProperty<QDeclarativeNdefRecord> *list,
-                                   int index)
+QDeclarativeNdefRecord *QDeclarativeNearField::at_messageRecord(QQmlListProperty<QDeclarativeNdefRecord> *list,
+                                                                int index)
 {
     QDeclarativeNearField *nearField = qobject_cast<QDeclarativeNearField *>(list->object);
     if (!nearField)
@@ -227,7 +227,7 @@ QDeclarativeNdefRecord *QDeclarativeNearField::at_messageRecord(QDeclarativeList
     return nearField->m_message.at(index);
 }
 
-void QDeclarativeNearField::clear_messageRecords(QDeclarativeListProperty<QDeclarativeNdefRecord> *list)
+void QDeclarativeNearField::clear_messageRecords(QQmlListProperty<QDeclarativeNdefRecord> *list)
 {
     QDeclarativeNearField *nearField = qobject_cast<QDeclarativeNearField *>(list->object);
     if (nearField) {
@@ -238,8 +238,8 @@ void QDeclarativeNearField::clear_messageRecords(QDeclarativeListProperty<QDecla
     }
 }
 
-void QDeclarativeNearField::append_filter(QDeclarativeListProperty<QDeclarativeNdefFilter> *list,
-                                           QDeclarativeNdefFilter *filter)
+void QDeclarativeNearField::append_filter(QQmlListProperty<QDeclarativeNdefFilter> *list,
+                                          QDeclarativeNdefFilter *filter)
 {
     QDeclarativeNearField *nearField = qobject_cast<QDeclarativeNearField *>(list->object);
     if (!nearField)
@@ -253,7 +253,7 @@ void QDeclarativeNearField::append_filter(QDeclarativeListProperty<QDeclarativeN
         nearField->registerMessageHandler();
 }
 
-int QDeclarativeNearField::count_filters(QDeclarativeListProperty<QDeclarativeNdefFilter> *list)
+int QDeclarativeNearField::count_filters(QQmlListProperty<QDeclarativeNdefFilter> *list)
 {
     QDeclarativeNearField *nearField = qobject_cast<QDeclarativeNearField *>(list->object);
     if (!nearField)
@@ -262,8 +262,8 @@ int QDeclarativeNearField::count_filters(QDeclarativeListProperty<QDeclarativeNd
     return nearField->m_filter.count();
 }
 
-QDeclarativeNdefFilter *QDeclarativeNearField::at_filter(QDeclarativeListProperty<QDeclarativeNdefFilter> *list,
-                                   int index)
+QDeclarativeNdefFilter *QDeclarativeNearField::at_filter(QQmlListProperty<QDeclarativeNdefFilter> *list,
+                                                         int index)
 {
     QDeclarativeNearField *nearField = qobject_cast<QDeclarativeNearField *>(list->object);
     if (!nearField)
@@ -272,7 +272,7 @@ QDeclarativeNdefFilter *QDeclarativeNearField::at_filter(QDeclarativeListPropert
     return nearField->m_filter.at(index);
 }
 
-void QDeclarativeNearField::clear_filter(QDeclarativeListProperty<QDeclarativeNdefFilter> *list)
+void QDeclarativeNearField::clear_filter(QQmlListProperty<QDeclarativeNdefFilter> *list)
 {
     QDeclarativeNearField *nearField = qobject_cast<QDeclarativeNearField *>(list->object);
     if (!nearField)
diff --git a/src/imports/nfc/qdeclarativenearfield_p.h b/src/imports/nfc/qdeclarativenearfield_p.h
index 47f0fc13..fe7c6b6e 100644
--- a/src/imports/nfc/qdeclarativenearfield_p.h
+++ b/src/imports/nfc/qdeclarativenearfield_p.h
@@ -43,32 +43,32 @@
 #define QDECLARATIVENEARFIELD_P_H
 
 #include <QtCore/QObject>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/QDeclarativeParserStatus>
+#include <QtQml/qqml.h>
+#include <QtQml/QQmlParserStatus>
+#include <QtNfc/QNearFieldManager>
 
-#include <qnearfieldmanager.h>
-#include <qdeclarativendefrecord.h>
+#include "qdeclarativendefrecord.h"
 
 class QDeclarativeNdefFilter;
 
 QTNFC_USE_NAMESPACE
 
-class QDeclarativeNearField : public QObject, public QDeclarativeParserStatus
+class QDeclarativeNearField : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
 
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeNdefRecord> messageRecords READ messageRecords NOTIFY messageRecordsChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeNdefFilter> filter READ filter NOTIFY filterChanged)
+    Q_PROPERTY(QQmlListProperty<QDeclarativeNdefRecord> messageRecords READ messageRecords NOTIFY messageRecordsChanged)
+    Q_PROPERTY(QQmlListProperty<QDeclarativeNdefFilter> filter READ filter NOTIFY filterChanged)
     Q_PROPERTY(bool orderMatch READ orderMatch WRITE setOrderMatch NOTIFY orderMatchChanged)
 
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
 
 public:
     explicit QDeclarativeNearField(QObject *parent = 0);
 
-    QDeclarativeListProperty<QDeclarativeNdefRecord> messageRecords();
+    QQmlListProperty<QDeclarativeNdefRecord> messageRecords();
 
-    QDeclarativeListProperty<QDeclarativeNdefFilter> filter();
+    QQmlListProperty<QDeclarativeNdefFilter> filter();
 
     bool orderMatch() const;
     void setOrderMatch(bool on);
@@ -97,19 +97,19 @@ private:
 
     void registerMessageHandler();
 
-    static void append_messageRecord(QDeclarativeListProperty<QDeclarativeNdefRecord> *list,
+    static void append_messageRecord(QQmlListProperty<QDeclarativeNdefRecord> *list,
                                      QDeclarativeNdefRecord *record);
-    static int count_messageRecords(QDeclarativeListProperty<QDeclarativeNdefRecord> *list);
-    static QDeclarativeNdefRecord *at_messageRecord(QDeclarativeListProperty<QDeclarativeNdefRecord> *list,
+    static int count_messageRecords(QQmlListProperty<QDeclarativeNdefRecord> *list);
+    static QDeclarativeNdefRecord *at_messageRecord(QQmlListProperty<QDeclarativeNdefRecord> *list,
                                                     int index);
-    static void clear_messageRecords(QDeclarativeListProperty<QDeclarativeNdefRecord> *list);
+    static void clear_messageRecords(QQmlListProperty<QDeclarativeNdefRecord> *list);
 
-    static void append_filter(QDeclarativeListProperty<QDeclarativeNdefFilter> *list,
+    static void append_filter(QQmlListProperty<QDeclarativeNdefFilter> *list,
                               QDeclarativeNdefFilter *filter);
-    static int count_filters(QDeclarativeListProperty<QDeclarativeNdefFilter> *list);
-    static QDeclarativeNdefFilter *at_filter(QDeclarativeListProperty<QDeclarativeNdefFilter> *list,
-                                                    int index);
-    static void clear_filter(QDeclarativeListProperty<QDeclarativeNdefFilter> *list);
+    static int count_filters(QQmlListProperty<QDeclarativeNdefFilter> *list);
+    static QDeclarativeNdefFilter *at_filter(QQmlListProperty<QDeclarativeNdefFilter> *list,
+                                             int index);
+    static void clear_filter(QQmlListProperty<QDeclarativeNdefFilter> *list);
 };
 
 #endif // QDECLARATIVENEARFIELD_P_H
diff --git a/src/imports/nfc/qdeclarativenearfieldsocket_p.h b/src/imports/nfc/qdeclarativenearfieldsocket_p.h
index 0e7bcc13..7536123d 100644
--- a/src/imports/nfc/qdeclarativenearfieldsocket_p.h
+++ b/src/imports/nfc/qdeclarativenearfieldsocket_p.h
@@ -43,16 +43,15 @@
 #define QDECLARATIVENEARFIELDSOCKET_P_H
 
 #include <QtCore/QObject>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/QDeclarativeParserStatus>
-
-#include <qllcpsocket.h>
+#include <QtQml/qqml.h>
+#include <QtQml/QQmlParserStatus>
+#include <QtNfc/QLlcpSocket>
 
 QTNFC_USE_NAMESPACE
 
 class QDeclarativeNearFieldSocketPrivate;
 
-class QDeclarativeNearFieldSocket : public QObject, public QDeclarativeParserStatus
+class QDeclarativeNearFieldSocket : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
 
@@ -63,7 +62,7 @@ class QDeclarativeNearFieldSocket : public QObject, public QDeclarativeParserSta
     Q_PROPERTY(bool listening READ listening WRITE setListening NOTIFY listeningChanged)
     Q_PROPERTY(QString stringData READ stringData WRITE sendStringData NOTIFY dataAvailable)
 
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
 
     Q_DECLARE_PRIVATE(QDeclarativeNearFieldSocket)