Merge 5.12 into 5.12.1

Change-Id: Ifbb60d6f8163a0a0dc316e1ac06d2ccdb7227f89

2 files changed, 27 insertions, 1 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 097d8b94..1c14aab6 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 00000000..422b3232
--- /dev/null
+++ b/dist/changes-5.11.3
@@ -0,0 +1,26 @@
+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.
+
+****************************************************************************
+*                               UNSPECIFIED                                *
+****************************************************************************
+
+ - [QTBUG-67595]  Fixed possible crash in PlatformInputContext::update.
+ - [QTBUG-70041]  Disable layout mirroring for virtual keyboard.
+ - Fix word candidate list auto hiding.