summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-17 12:28:25 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-17 12:28:25 +0200
commit583c46f5ddfbc69e5c8b5fc8ac1c403241ab5686 (patch)
tree03694817caf8f9ac79f68d00f5785fb21a3448ef
parent14b5821f7b9998c1263c592d2cc70f21f1e72981 (diff)
parent033c46d07afb7552c4ecaa49e27b16d490d5fbde (diff)
downloadqtsensors-583c46f5ddfbc69e5c8b5fc8ac1c403241ab5686.tar.gz
Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"
-rw-r--r--.qmake.conf2
-rw-r--r--dist/changes-5.12.424
2 files changed, 25 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 1bf9543..f1a6177 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.12.3
+MODULE_VERSION = 5.12.4
diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4
new file mode 100644
index 0000000..46807db
--- /dev/null
+++ b/dist/changes-5.12.4
@@ -0,0 +1,24 @@
+Qt 5.12.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.3.
+
+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.
+
+****************************************************************************
+* Android *
+****************************************************************************
+
+ - Rewrite Qt Android Sensors using NDK API.