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

Change-Id: I337d146591585cfae67122b030b72f6f83986b76

9 files changed, 96 insertions, 13 deletions

diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0
new file mode 100644
index 00000000..761debe5
--- /dev/null
+++ b/dist/changes-5.12.0
@@ -0,0 +1,70 @@
+Qt 5.12 introduces many new features and improvements as well as bugfixes
+over the 5.11.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                            Qt 5.12.0 Changes                             *
+****************************************************************************
+
+QtBluetooth
+-----------
+
+ - [QTBUG-68026] Excluded ICC build for QtBluetooth. Previously, ICC attempted to build
+   the WinRT implementation which does not work. In the long term, ICC should build
+   the Win32 port of QtBluetooth which unfortunately does not exist yet.
+
+ - [QTBUG-68550] Added a DBus based Bluez implementation for QBluetoothSocket. Previously,
+   raw Bluetooth socket API was used to established the connection. However
+   this is no longer the recommended BlueZ way and hence the need for this change.
+   The new implementation is chosen if the BlueZ runtime version is 5.46+. This change
+   required extensive redesign of the QBluetoothSocket internals affecting all other platforms.
+
+ - [QTBUG-69857] Fixed crash in QBluetoothServiceInfo::unregisterService() on macOS.
+
+ - Added manufacturer data related API to QBluetoothDeviceInfo. This is needed for
+   Bluetooth Low Energy device scans.
+
+ - [QTBUG-46008] [QTBUG-69747] Added QBluetoothDeviceDiscoveryAgent::deviceUpdated()
+   signal. The signal permits live updates of changing Bluetooth Low Energy data such
+   as manufacturer or RSSI information during the discovery.
+
+ - Fixed incorrect QLowEnergyService::state() of local (peripheral) services.
+
+ - Fixed failing Bluetooth config test when using clang due to stricter error
+   dectection in clang (when compared to gcc).
+
+ - [QTBUG-70222] Fixed incorrect detection of BTLE Battery services in BlueZ 5.48+
+
+ - [QTBUG-70295] Added implementation to properly handle pin code pairing
+   (BluetoothDevice.PAIRING_VARIANT_PIN) on Android. So far, only
+   BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION was supported.
+
+ - [QTBUG-70754] Ensured that repeated calls to QLowEnergyCOntroller::startAdvertising()
+   updates the to-be-updated info on Linux.
+
+ - [QTBUG-58660] Fixed discovery of unpaired Bluetooth devices on WinRT.
+
+ - [QTBUG-58529] Fixed incorrect BluetoothProfileDescriptorList generation by various
+   QBluetoothSocket related classes, documentation and examples.
+
+QtNfc
+-----
+
+ - [QTBUG-62169] Added QNearFieldManager::isSupported(). This only works on
+   Android at the moment.
+
+ - Added QNearFieldManager::AdapterState enum and the related adapterStateChanged()
+   signal.
diff --git a/src/nfc/qnearfieldmanager_emulator.cpp b/src/nfc/qnearfieldmanager_emulator.cpp
index c2c037f6..8a61a3a9 100644
--- a/src/nfc/qnearfieldmanager_emulator.cpp
+++ b/src/nfc/qnearfieldmanager_emulator.cpp
@@ -49,12 +49,10 @@ QT_BEGIN_NAMESPACE
 
 QNearFieldManagerPrivateImpl::QNearFieldManagerPrivateImpl()
 {
-    TagActivator *tagActivator = TagActivator::instance();
+    globalTagActivator->initialize();
 
-    tagActivator->initialize();
-
-    connect(tagActivator, &TagActivator::tagActivated, this, &QNearFieldManagerPrivateImpl::tagActivated);
-    connect(tagActivator, &TagActivator::tagDeactivated, this, &QNearFieldManagerPrivateImpl::tagDeactivated);
+    connect(globalTagActivator, &TagActivator::tagActivated, this, &QNearFieldManagerPrivateImpl::tagActivated);
+    connect(globalTagActivator, &TagActivator::tagDeactivated, this, &QNearFieldManagerPrivateImpl::tagDeactivated);
 }
 
 QNearFieldManagerPrivateImpl::~QNearFieldManagerPrivateImpl()
@@ -68,7 +66,7 @@ bool QNearFieldManagerPrivateImpl::isAvailable() const
 
 void QNearFieldManagerPrivateImpl::reset()
 {
-    TagActivator::instance()->reset();
+    globalTagActivator->reset();
 }
 
 void QNearFieldManagerPrivateImpl::tagActivated(TagBase *tag)
diff --git a/src/nfc/qnearfieldtarget_emulator.cpp b/src/nfc/qnearfieldtarget_emulator.cpp
index 030718cc..0723b655 100644
--- a/src/nfc/qnearfieldtarget_emulator.cpp
+++ b/src/nfc/qnearfieldtarget_emulator.cpp
@@ -51,7 +51,6 @@ QT_BEGIN_NAMESPACE
 
 static QMutex tagMutex;
 static QMap<TagBase *, bool> tagMap;
-static TagActivator tagActivator;
 
 TagType1::TagType1(TagBase *tag, QObject *parent)
 :   QNearFieldTagType1(parent), m_tag(tag)
@@ -201,7 +200,11 @@ void TagActivator::initialize()
     if (!tagMap.isEmpty())
         return;
 
+#ifndef BUILTIN_TESTDATA
     QDirIterator nfcTargets(QDir::currentPath(), QStringList(QStringLiteral("*.nfc")), QDir::Files);
+#else
+    QDirIterator nfcTargets(":/nfcdata", QStringList(QStringLiteral("*.nfc")), QDir::Files);
+#endif
     while (nfcTargets.hasNext()) {
         const QString targetFilename = nfcTargets.next();
 
@@ -244,11 +247,6 @@ void TagActivator::reset()
     tagMap.clear();
 }
 
-TagActivator *TagActivator::instance()
-{
-    return &tagActivator;
-}
-
 void TagActivator::timerEvent(QTimerEvent *e)
 {
     Q_UNUSED(e);
diff --git a/src/nfc/qnearfieldtarget_emulator_p.h b/src/nfc/qnearfieldtarget_emulator_p.h
index 70a67be8..1b9f7bdb 100644
--- a/src/nfc/qnearfieldtarget_emulator_p.h
+++ b/src/nfc/qnearfieldtarget_emulator_p.h
@@ -122,6 +122,8 @@ private:
     int timerId;
 };
 
+Q_GLOBAL_STATIC(TagActivator, globalTagActivator);
+
 QT_END_NAMESPACE
 
 #endif // QNEARFIELDTARGET_EMULATOR_P_H
diff --git a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro
index 0361235a..e01f9b84 100644
--- a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro
+++ b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro
@@ -22,3 +22,8 @@ SOURCES += \
     targetemulator.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\"
+
+TESTDATA += "$$PWD/../nfcdata/Qt Labs Website Tag Type1.nfc" \
+            "$$PWD/../nfcdata/Qt Website Tag Type1.nfc"
+
+builtin_testdata: DEFINES += BUILTIN_TESTDATA
diff --git a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro
index 649541fd..e765151d 100644
--- a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro
+++ b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro
@@ -22,3 +22,8 @@ SOURCES += \
     targetemulator.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\"
+
+TESTDATA += "$$PWD/../nfcdata/Qt Labs Website Tag Type1.nfc" \
+            "$$PWD/../nfcdata/Qt Website Tag Type1.nfc"
+
+builtin_testdata: DEFINES += BUILTIN_TESTDATA
diff --git a/tests/auto/qnearfieldtagtype2/Dynamic Empty Tag.nfc b/tests/auto/qnearfieldtagtype2/nfcdata/Dynamic Empty Tag.nfc
index 30cf6b2d..30cf6b2d 100644
--- a/tests/auto/qnearfieldtagtype2/Dynamic Empty Tag.nfc
+++ b/tests/auto/qnearfieldtagtype2/nfcdata/Dynamic Empty Tag.nfc
diff --git a/tests/auto/qnearfieldtagtype2/Empty Tag.nfc b/tests/auto/qnearfieldtagtype2/nfcdata/Empty Tag.nfc
index 22b31b4a..22b31b4a 100644
--- a/tests/auto/qnearfieldtagtype2/Empty Tag.nfc
+++ b/tests/auto/qnearfieldtagtype2/nfcdata/Empty Tag.nfc
diff --git a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
index 45d2fbe8..aa388312 100644
--- a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
+++ b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
@@ -21,4 +21,9 @@ SOURCES += \
     qnearfieldmanager_emulator.cpp \
     targetemulator.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+DEFINES += SRCDIR=\\\"$$PWD/nfcdata\\\"
+
+TESTDATA += "$$PWD/nfcdata/Dynamic Empty Tag.nfc" \
+            "$$PWD/nfcdata/Empty Tag.nfc"
+
+builtin_testdata: DEFINES += BUILTIN_TESTDATA