aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-02 03:02:51 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2019-07-03 07:29:40 +0000
commitfe4cb8c970ccc8801f18b953ac7d0969943a9a0b (patch)
tree99bedd806fa49bf45c698ba91605d5654527fefc
parent676ea1da22f63420974314ad7937c088377bd6ed (diff)
parentdfe0bef2be38406782a5b05542fd8d18569e6bbe (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
-rw-r--r--.qmake.conf2
-rw-r--r--dist/changes-5.12.420
2 files changed, 21 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 1ed62c5a..cf9ee7e3 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.13.1
+MODULE_VERSION = 5.13.1 \ No newline at end of file
diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4
new file mode 100644
index 00000000..a285cd8e
--- /dev/null
+++ b/dist/changes-5.12.4
@@ -0,0 +1,20 @@
+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.
+
+ - This release contains only minor code improvements.