Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/bluetooth/qlowenergycontroller.h

Change-Id: I15571e47fbf06545d46d1b9a9b2b47bf815ae293

6 files changed, 13 insertions, 10 deletions

diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h
index 5c2e6b44..0d5176d9 100644
--- a/src/nfc/qnearfieldmanager.h
+++ b/src/nfc/qnearfieldmanager.h
@@ -65,8 +65,8 @@ public:
     Q_ENUM(TargetAccessMode)
     Q_DECLARE_FLAGS(TargetAccessModes, TargetAccessMode)
 
-    explicit QNearFieldManager(QObject *parent = 0);
-    explicit QNearFieldManager(QNearFieldManagerPrivate *backend, QObject *parent = 0);
+    explicit QNearFieldManager(QObject *parent = Q_NULLPTR);
+    explicit QNearFieldManager(QNearFieldManagerPrivate *backend, QObject *parent = Q_NULLPTR);
     ~QNearFieldManager();
 
     bool isAvailable() const;
diff --git a/src/nfc/qnearfieldsharemanager.h b/src/nfc/qnearfieldsharemanager.h
index 9e5a1a27..5b76b84b 100644
--- a/src/nfc/qnearfieldsharemanager.h
+++ b/src/nfc/qnearfieldsharemanager.h
@@ -53,7 +53,7 @@ class Q_NFC_EXPORT QNearFieldShareManager : public QObject
     Q_OBJECT
 
 public:
-    explicit QNearFieldShareManager(QObject *parent = 0);
+    explicit QNearFieldShareManager(QObject *parent = Q_NULLPTR);
     ~QNearFieldShareManager();
 
     enum ShareError {
diff --git a/src/nfc/qnearfieldsharetarget.h b/src/nfc/qnearfieldsharetarget.h
index 2bb91545..bde5e8b7 100644
--- a/src/nfc/qnearfieldsharetarget.h
+++ b/src/nfc/qnearfieldsharetarget.h
@@ -69,7 +69,7 @@ Q_SIGNALS:
     void shareFinished();
 
 private:
-    explicit QNearFieldShareTarget(QNearFieldShareManager::ShareModes modes, QObject *parent = 0);
+    explicit QNearFieldShareTarget(QNearFieldShareManager::ShareModes modes, QObject *parent = Q_NULLPTR);
 
     QNearFieldShareTargetPrivate *d_ptr;
     Q_DECLARE_PRIVATE(QNearFieldShareTarget)
diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h
index c8e6d448..dc081f5e 100644
--- a/src/nfc/qnearfieldtarget.h
+++ b/src/nfc/qnearfieldtarget.h
@@ -116,7 +116,7 @@ public:
         QSharedDataPointer<RequestIdPrivate> d;
     };
 
-    explicit QNearFieldTarget(QObject *parent = 0);
+    explicit QNearFieldTarget(QObject *parent = Q_NULLPTR);
     virtual ~QNearFieldTarget();
 
     virtual QByteArray uid() const = 0;
diff --git a/src/nfc/qqmlndefrecord.cpp b/src/nfc/qqmlndefrecord.cpp
index 1f855ede..cd6620cc 100644
--- a/src/nfc/qqmlndefrecord.cpp
+++ b/src/nfc/qqmlndefrecord.cpp
@@ -42,6 +42,8 @@
 #include <QtCore/QMap>
 #include <QtCore/QRegExp>
 
+#include <QtCore/qglobalstatic.h>
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -173,7 +175,8 @@ QT_BEGIN_NAMESPACE
     This macro should be expanded in the implementation file for \a className.
 */
 
-static QMap<QString, const QMetaObject *> registeredNdefRecordTypes;
+typedef QMap<QString, const QMetaObject *> NDefRecordTypesMap;
+Q_GLOBAL_STATIC(NDefRecordTypesMap, registeredNdefRecordTypes)
 
 class QQmlNdefRecordPrivate
 {
@@ -202,7 +205,7 @@ void qRegisterNdefRecordTypeHelper(const QMetaObject *metaObject,
                                    QNdefRecord::TypeNameFormat typeNameFormat,
                                    const QByteArray &type)
 {
-    registeredNdefRecordTypes.insert(urnForRecordType(typeNameFormat, type), metaObject);
+    registeredNdefRecordTypes()->insert(urnForRecordType(typeNameFormat, type), metaObject);
 }
 
 /*!
@@ -212,7 +215,7 @@ QQmlNdefRecord *qNewDeclarativeNdefRecordForNdefRecord(const QNdefRecord &record
 {
     const QString urn = urnForRecordType(record.typeNameFormat(), record.type());
 
-    QMapIterator<QString, const QMetaObject *> i(registeredNdefRecordTypes);
+    QMapIterator<QString, const QMetaObject *> i(*registeredNdefRecordTypes());
     while (i.hasNext()) {
         i.next();
 
diff --git a/src/nfc/qqmlndefrecord.h b/src/nfc/qqmlndefrecord.h
index b9f3c132..9e8d8bbd 100644
--- a/src/nfc/qqmlndefrecord.h
+++ b/src/nfc/qqmlndefrecord.h
@@ -69,8 +69,8 @@ public:
     };
     Q_ENUM(TypeNameFormat)
 
-    explicit QQmlNdefRecord(QObject *parent = 0);
-    explicit QQmlNdefRecord(const QNdefRecord &record, QObject *parent = 0);
+    explicit QQmlNdefRecord(QObject *parent = Q_NULLPTR);
+    explicit QQmlNdefRecord(const QNdefRecord &record, QObject *parent = Q_NULLPTR);
     ~QQmlNdefRecord();
 
     QString type() const;