summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-08 19:41:17 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-08 19:41:23 +0200
commitc1803d266854c6f71994705133e5b2b93a060d1e (patch)
tree16a118eea6cfa8c69af7f156933ff539b2e286cd
parentdd4593c61e4b77c4e3b1ee516a1e8825ebb0197b (diff)
parentc4638bd5dca3a468fb8aa7e79a5ebe612bac88bb (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
-rw-r--r--dist/changes-5.12.42
-rw-r--r--dist/changes-5.12.538
2 files changed, 39 insertions, 1 deletions
diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4
index cb7ef2bf..d751f704 100644
--- a/dist/changes-5.12.4
+++ b/dist/changes-5.12.4
@@ -18,7 +18,7 @@ Each of these identifiers can be entered in the bug tracker to obtain more
information about a particular change.
****************************************************************************
-* Qt 5.12.3 Changes *
+* Qt 5.12.4 Changes *
****************************************************************************
QtBluetooth
diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5
new file mode 100644
index 00000000..9f0b41b1
--- /dev/null
+++ b/dist/changes-5.12.5
@@ -0,0 +1,38 @@
+Qt 5.12.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.4.
+
+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.5 Changes *
+****************************************************************************
+
+QtBluetooth
+-----------
+
+ - [QTBUG-76847] Fixed ambiguous type conversions on Apple platforms.
+
+ - [QTBUG-75089] Removed attempt to delete nullptr on WinRT when calling
+ QBluetoothDeviceDiscoveryAgent::stop().
+
+ - [QTBUG-76565] Reverted handling of PAIRING_VARIANT_PIN by
+ QBluetoothLocalDevice on Android.
+
+ - [QTBUG-62520] Improved documentation covering platform limitations on WinRT.
+
+ - Fixed QLowEnergyAdvertisingData::setManufacturerData() on Android. Previously a wrong
+ JNI signature prevented setting the data.