Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	.qmake.conf
	src/nfc/doc/src/nfc-index.qdoc

Change-Id: Ie12d3023ff934f6579ae93617c95fc654e85a7f0

2 files changed, 3 insertions, 3 deletions

diff --git a/src/imports/nfc/plugins.qmltypes b/src/imports/nfc/plugins.qmltypes
index 6abc211d..555b797f 100644
--- a/src/imports/nfc/plugins.qmltypes
+++ b/src/imports/nfc/plugins.qmltypes
@@ -1,4 +1,4 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.2
 
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
@@ -7,6 +7,7 @@ import QtQuick.tooling 1.1
 // 'qmlplugindump -nonrelocatable QtNfc 5.5'
 
 Module {
+    dependencies: []
     Component {
         name: "QDeclarativeNdefFilter"
         prototype: "QObject"
diff --git a/src/imports/nfc/qdeclarativendeftextrecord_p.h b/src/imports/nfc/qdeclarativendeftextrecord_p.h
index 8a65a951..4699f5a2 100644
--- a/src/imports/nfc/qdeclarativendeftextrecord_p.h
+++ b/src/imports/nfc/qdeclarativendeftextrecord_p.h
@@ -59,8 +59,6 @@ class QDeclarativeNdefTextRecord : public QQmlNdefRecord
     Q_PROPERTY(QString locale READ locale WRITE setLocale NOTIFY localeChanged)
     Q_PROPERTY(LocaleMatch localeMatch READ localeMatch NOTIFY localeMatchChanged)
 
-    Q_ENUMS(LocaleMatch)
-
 public:
     enum LocaleMatch {
         LocaleMatchedNone,
@@ -68,6 +66,7 @@ public:
         LocaleMatchedLanguage,
         LocaleMatchedLanguageAndCountry
     };
+    Q_ENUM(LocaleMatch)
 
     explicit QDeclarativeNdefTextRecord(QObject *parent = 0);
     Q_INVOKABLE QDeclarativeNdefTextRecord(const QNdefRecord &record, QObject *parent = 0);