summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2019-01-08 08:19:03 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2019-01-08 08:19:03 +0200
commite43a75e6f07967a3f7ff398ed46d04aefb8890ec (patch)
treed1bb37a95f381a5052ce7f2f5901f6570717207d
parentdb95e45174f6c2b3ec664d352f99cffffa5f3908 (diff)
parentf7580fc30b4ed060b5075be6592c5c0703d40c53 (diff)
downloadqtserialport-e43a75e6f07967a3f7ff398ed46d04aefb8890ec.tar.gz
Merge 5.12 into 5.12.1
Change-Id: Iad01290b6efe468e4d72877110cbdbefb2707448
-rw-r--r--.qmake.conf2
-rw-r--r--dist/changes-5.11.320
2 files changed, 21 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 097d8b9..1c14aab 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.12.0
+MODULE_VERSION = 5.12.1
diff --git a/dist/changes-5.11.3 b/dist/changes-5.11.3
new file mode 100644
index 0000000..f71fa34
--- /dev/null
+++ b/dist/changes-5.11.3
@@ -0,0 +1,20 @@
+Qt 5.11.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.11.0 through 5.11.2.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.11 series is binary compatible with the 5.10.x series.
+Applications compiled for 5.10 will continue to run with 5.11.
+
+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.