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

Conflicts:
	src/bluetooth/qlowenergycontroller.h

Change-Id: I15571e47fbf06545d46d1b9a9b2b47bf815ae293

17 files changed, 33 insertions, 31 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.h b/src/bluetooth/qbluetoothdevicediscoveryagent.h
index 4b74f27f..954ae704 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent.h
@@ -75,9 +75,9 @@ public:
     };
     Q_ENUM(InquiryType)
 
-    QBluetoothDeviceDiscoveryAgent(QObject *parent = 0);
+    explicit QBluetoothDeviceDiscoveryAgent(QObject *parent = Q_NULLPTR);
     explicit QBluetoothDeviceDiscoveryAgent(const QBluetoothAddress &deviceAdapter,
-                                            QObject *parent = 0);
+                                            QObject *parent = Q_NULLPTR);
     ~QBluetoothDeviceDiscoveryAgent();
 
     // TODO Remove inquiry type in Qt 6 -> not really used anywhere
diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h
index 898c6d65..2cf26a21 100644
--- a/src/bluetooth/qbluetoothdeviceinfo.h
+++ b/src/bluetooth/qbluetoothdeviceinfo.h
@@ -231,7 +231,7 @@ public:
     void setRssi(qint16 signal);
 
     void setServiceUuids(const QList<QBluetoothUuid> &uuids, DataCompleteness completeness);
-    QList<QBluetoothUuid> serviceUuids(DataCompleteness *completeness = 0) const;
+    QList<QBluetoothUuid> serviceUuids(DataCompleteness *completeness = Q_NULLPTR) const;
     DataCompleteness serviceUuidsCompleteness() const;
 
     void setCoreConfigurations(QBluetoothDeviceInfo::CoreConfigurations coreConfigs);
diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h
index 5e1bb3eb..49de25ae 100644
--- a/src/bluetooth/qbluetoothlocaldevice.h
+++ b/src/bluetooth/qbluetoothlocaldevice.h
@@ -79,8 +79,8 @@ public:
     };
     Q_ENUM(Error)
 
-    QBluetoothLocalDevice(QObject *parent = 0);
-    explicit QBluetoothLocalDevice(const QBluetoothAddress &address, QObject *parent = 0);
+    explicit QBluetoothLocalDevice(QObject *parent = Q_NULLPTR);
+    explicit QBluetoothLocalDevice(const QBluetoothAddress &address, QObject *parent = Q_NULLPTR);
     virtual ~QBluetoothLocalDevice();
 
     bool isValid() const;
diff --git a/src/bluetooth/qbluetoothserver.h b/src/bluetooth/qbluetoothserver.h
index 8c8669f2..e54c4452 100644
--- a/src/bluetooth/qbluetoothserver.h
+++ b/src/bluetooth/qbluetoothserver.h
@@ -70,7 +70,7 @@ public:
     };
     Q_ENUM(Error)
 
-    QBluetoothServer(QBluetoothServiceInfo::Protocol serverType, QObject *parent = 0);
+    explicit QBluetoothServer(QBluetoothServiceInfo::Protocol serverType, QObject *parent = Q_NULLPTR);
     ~QBluetoothServer();
 
     void close();
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h
index ebbf6277..7bc656ce 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent.h
@@ -80,8 +80,8 @@ public:
     };
     Q_ENUM(DiscoveryMode)
 
-    QBluetoothServiceDiscoveryAgent(QObject *parent = 0);
-    explicit QBluetoothServiceDiscoveryAgent(const QBluetoothAddress &deviceAdapter, QObject *parent = 0);
+    explicit QBluetoothServiceDiscoveryAgent(QObject *parent = Q_NULLPTR);
+    explicit QBluetoothServiceDiscoveryAgent(const QBluetoothAddress &deviceAdapter, QObject *parent = Q_NULLPTR);
     ~QBluetoothServiceDiscoveryAgent();
 
     bool isActive() const;
diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h
index 506c3d49..97b6685b 100644
--- a/src/bluetooth/qbluetoothsocket.h
+++ b/src/bluetooth/qbluetoothsocket.h
@@ -88,8 +88,8 @@ public:
     };
     Q_ENUM(SocketError)
 
-    explicit QBluetoothSocket(QBluetoothServiceInfo::Protocol socketType, QObject *parent = 0);   // create socket of type socketType
-    QBluetoothSocket(QObject *parent = 0);  // create a blank socket
+    explicit QBluetoothSocket(QBluetoothServiceInfo::Protocol socketType, QObject *parent = Q_NULLPTR);   // create socket of type socketType
+    explicit QBluetoothSocket(QObject *parent = Q_NULLPTR);  // create a blank socket
     virtual ~QBluetoothSocket();
 
     void abort();
diff --git a/src/bluetooth/qbluetoothtransfermanager.h b/src/bluetooth/qbluetoothtransfermanager.h
index b7b78098..d1171588 100644
--- a/src/bluetooth/qbluetoothtransfermanager.h
+++ b/src/bluetooth/qbluetoothtransfermanager.h
@@ -58,7 +58,7 @@ class Q_BLUETOOTH_EXPORT QBluetoothTransferManager : public QObject
     Q_OBJECT
 
 public:
-    explicit QBluetoothTransferManager(QObject *parent = 0);
+    explicit QBluetoothTransferManager(QObject *parent = Q_NULLPTR);
     ~QBluetoothTransferManager();
 
     QBluetoothTransferReply *put(const QBluetoothTransferRequest &request, QIODevice *data);
diff --git a/src/bluetooth/qbluetoothtransferreply.h b/src/bluetooth/qbluetoothtransferreply.h
index 324d822f..c2b0b622 100644
--- a/src/bluetooth/qbluetoothtransferreply.h
+++ b/src/bluetooth/qbluetoothtransferreply.h
@@ -88,7 +88,7 @@ Q_SIGNALS:
     void error(QBluetoothTransferReply::TransferError lastError);
 
 protected:
-    explicit QBluetoothTransferReply(QObject *parent = 0);
+    explicit QBluetoothTransferReply(QObject *parent = Q_NULLPTR);
     void setManager(QBluetoothTransferManager *manager);
     void setRequest(const QBluetoothTransferRequest &request);
 
diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h
index e44e6ce4..fb301c37 100644
--- a/src/bluetooth/qbluetoothuuid.h
+++ b/src/bluetooth/qbluetoothuuid.h
@@ -383,8 +383,8 @@ public:
 
     int minimumSize() const;
 
-    quint16 toUInt16(bool *ok = 0) const;
-    quint32 toUInt32(bool *ok = 0) const;
+    quint16 toUInt16(bool *ok = Q_NULLPTR) const;
+    quint32 toUInt32(bool *ok = Q_NULLPTR) const;
     quint128 toUInt128() const;
 
     static QString serviceClassToString(ServiceClassUuid uuid);
diff --git a/src/bluetooth/qlowenergycontroller.h b/src/bluetooth/qlowenergycontroller.h
index 12a91a75..14d5c280 100644
--- a/src/bluetooth/qlowenergycontroller.h
+++ b/src/bluetooth/qlowenergycontroller.h
@@ -90,12 +90,12 @@ public:
     Q_ENUM(Role)
 
     explicit QLowEnergyController(const QBluetoothAddress &remoteDevice,
-                                     QObject *parent = 0); // TODO Qt 6 remove ctor
+                                  QObject *parent = Q_NULLPTR); // TODO Qt 6 remove ctor
     explicit QLowEnergyController(const QBluetoothDeviceInfo &remoteDevice,
-                                     QObject *parent = 0);
+                                  QObject *parent = Q_NULLPTR);
     explicit QLowEnergyController(const QBluetoothAddress &remoteDevice,
-                                     const QBluetoothAddress &localDevice,
-                                     QObject *parent = 0); // TODO Qt 6 remove ctor
+                                  const QBluetoothAddress &localDevice,
+                                  QObject *parent = Q_NULLPTR); // TODO Qt 6 remove ctor
 
     static QLowEnergyController *createCentral(const QBluetoothDeviceInfo &remoteDevice,
                                                QObject *parent = 0);
@@ -120,8 +120,7 @@ public:
 
     void discoverServices();
     QList<QBluetoothUuid> services() const;
-    QLowEnergyService *createServiceObject(
-            const QBluetoothUuid &service, QObject *parent = 0);
+    QLowEnergyService *createServiceObject(const QBluetoothUuid &service, QObject *parent = Q_NULLPTR);
 
     void startAdvertising(const QLowEnergyAdvertisingParameters &parameters,
                           const QLowEnergyAdvertisingData &advertisingData,
diff --git a/src/bluetooth/qlowenergyservice.h b/src/bluetooth/qlowenergyservice.h
index 0449f4c9..f138459f 100644
--- a/src/bluetooth/qlowenergyservice.h
+++ b/src/bluetooth/qlowenergyservice.h
@@ -136,7 +136,7 @@ private:
     friend class QLowEnergyController;
     friend class QLowEnergyControllerPrivate;
     QLowEnergyService(QSharedPointer<QLowEnergyServicePrivate> p,
-                      QObject *parent = 0);
+                      QObject *parent = Q_NULLPTR);
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QLowEnergyService::ServiceTypes)
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;