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

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

Change-Id: Ie12d3023ff934f6579ae93617c95fc654e85a7f0

6 files changed, 10 insertions, 4 deletions

diff --git a/src/nfc/qllcpsocket_p.h b/src/nfc/qllcpsocket_p.h
index db49b4c0..b797ef5b 100644
--- a/src/nfc/qllcpsocket_p.h
+++ b/src/nfc/qllcpsocket_p.h
@@ -71,6 +71,7 @@ public:
         BoundState = QAbstractSocket::BoundState,
         ListeningState = QAbstractSocket::ListeningState
     };
+    Q_ENUM(SocketState)
 
     enum SocketError {
         UnknownSocketError = QAbstractSocket::UnknownSocketError,
@@ -78,6 +79,7 @@ public:
         SocketAccessError = QAbstractSocket::SocketAccessError,
         SocketResourceError = QAbstractSocket::SocketResourceError
     };
+    Q_ENUM(SocketError)
 
     explicit QLlcpSocket(QObject *parent = 0);
     ~QLlcpSocket();
diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h
index 8dab134f..416c5e91 100644
--- a/src/nfc/qnearfieldmanager.h
+++ b/src/nfc/qnearfieldmanager.h
@@ -56,6 +56,7 @@ public:
         NdefWriteTargetAccess = 0x02,
         TagTypeSpecificTargetAccess = 0x04
     };
+    Q_ENUM(TargetAccessMode)
     Q_DECLARE_FLAGS(TargetAccessModes, TargetAccessMode)
 
     explicit QNearFieldManager(QObject *parent = 0);
diff --git a/src/nfc/qnearfieldsharemanager.h b/src/nfc/qnearfieldsharemanager.h
index 330cc621..264e82b6 100644
--- a/src/nfc/qnearfieldsharemanager.h
+++ b/src/nfc/qnearfieldsharemanager.h
@@ -45,8 +45,6 @@ class QNearFieldShareTarget;
 class Q_NFC_EXPORT QNearFieldShareManager : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(ShareError)
-    Q_ENUMS(ShareMode)
 
 public:
     explicit QNearFieldShareManager(QObject *parent = 0);
@@ -63,12 +61,14 @@ public:
         ShareAlreadyInProgressError,
         SharePermissionDeniedError
     };
+    Q_ENUM(ShareError)
 
     enum ShareMode {
         NoShare = 0x00,
         NdefShare = 0x01,
         FileShare = 0x02
     };
+    Q_ENUM(ShareMode)
     Q_DECLARE_FLAGS(ShareModes, ShareMode)
 
 public:
diff --git a/src/nfc/qnearfieldtagtype1_p.h b/src/nfc/qnearfieldtagtype1_p.h
index efc757a0..0f5ad26e 100644
--- a/src/nfc/qnearfieldtagtype1_p.h
+++ b/src/nfc/qnearfieldtagtype1_p.h
@@ -62,6 +62,7 @@ public:
         EraseAndWrite,
         WriteOnly
     };
+    Q_ENUM(WriteMode)
 
     explicit QNearFieldTagType1(QObject *parent = 0);
     ~QNearFieldTagType1();
diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h
index fef74946..a7abbe25 100644
--- a/src/nfc/qnearfieldtarget.h
+++ b/src/nfc/qnearfieldtarget.h
@@ -65,6 +65,7 @@ public:
         NfcTagType4,
         MifareTag
     };
+    Q_ENUM(Type)
 
     enum AccessMethod {
         UnknownAccess = 0x00,
@@ -72,6 +73,7 @@ public:
         TagTypeSpecificAccess = 0x02,
         LlcpAccess = 0x04
     };
+    Q_ENUM(AccessMethod)
     Q_DECLARE_FLAGS(AccessMethods, AccessMethod)
 
     enum Error {
@@ -85,6 +87,7 @@ public:
         NdefReadError,
         NdefWriteError
     };
+    Q_ENUM(Error)
 
     class RequestIdPrivate;
     class Q_NFC_EXPORT RequestId
@@ -158,6 +161,5 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QNearFieldTarget::AccessMethods)
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QNearFieldTarget::RequestId)
-Q_DECLARE_METATYPE(QNearFieldTarget::Error)
 
 #endif // QNEARFIELDTARGET_H
diff --git a/src/nfc/qqmlndefrecord.h b/src/nfc/qqmlndefrecord.h
index 71cd5513..dbd947ee 100644
--- a/src/nfc/qqmlndefrecord.h
+++ b/src/nfc/qqmlndefrecord.h
@@ -52,7 +52,6 @@ class Q_NFC_EXPORT QQmlNdefRecord : public QObject
     Q_PROPERTY(TypeNameFormat typeNameFormat READ typeNameFormat WRITE setTypeNameFormat NOTIFY typeNameFormatChanged)
     Q_PROPERTY(QNdefRecord record READ record WRITE setRecord NOTIFY recordChanged)
 
-    Q_ENUMS(TypeNameFormat)
 public:
     enum TypeNameFormat {
         Empty = QNdefRecord::Empty,
@@ -62,6 +61,7 @@ public:
         ExternalRtd = QNdefRecord::ExternalRtd,
         Unknown = QNdefRecord::Unknown
     };
+    Q_ENUM(TypeNameFormat)
 
     explicit QQmlNdefRecord(QObject *parent = 0);
     explicit QQmlNdefRecord(const QNdefRecord &record, QObject *parent = 0);