From 7aa3859508e7c78f8340d667b4a891b4c0c14303 Mon Sep 17 00:00:00 2001
From: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Date: Fri, 21 Dec 2018 10:32:13 +0100
Subject: Doc: Add the missing \QtMinorVersion argument

Without this argument to the \qml...\endqml block,
\1 will not be translated to the Qt minor version.

Change-Id: I73741639a060c532726044b098cececdf795ee78
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
---
 src/effects/doc/src/qtgraphicaleffects.qdoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/effects/doc/src/qtgraphicaleffects.qdoc b/src/effects/doc/src/qtgraphicaleffects.qdoc
index 21476f1..104e46e 100644
--- a/src/effects/doc/src/qtgraphicaleffects.qdoc
+++ b/src/effects/doc/src/qtgraphicaleffects.qdoc
@@ -39,12 +39,12 @@
     user interface as UI components.
 
     To use the types in this module, import the module with the following line:
-    \qml
+    \qml \QtMinorVersion
     import QtGraphicalEffects 1.\1
     \endqml
 
     \note There are no API changes since version 1.0, so it's OK
-    to import version 1.0, or 1.\1 for convenience.
+    to import version 1.0, or 1.\QtMinorVersion for convenience.
  */
 
 /*!
-- 
cgit v1.2.3


From 34667d61bf562e7e301f262089c3160e0d854df2 Mon Sep 17 00:00:00 2001
From: Antti Kokko <antti.kokko@qt.io>
Date: Wed, 9 Jan 2019 10:09:41 +0200
Subject:  Add changes file for Qt 5.12.1

+ 7e2544e28cac2fbf7176b6692dacc57096774249 Bump version
+ d560b79d050659715159d5f04b2e96fd38d0230c Add changes file for Qt 5.11.3
+ 7aa3859508e7c78f8340d667b4a891b4c0c14303 Doc: Add the missing \QtMinorVersion argument
+ cdb0a5dddf84e27dda294cecebd64c282227f162 Bump version

Change-Id: I0bc4374b3059181fdfbfc765e592ec7ccd424973
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
---
 dist/changes-5.12.1 | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 dist/changes-5.12.1

diff --git a/dist/changes-5.12.1 b/dist/changes-5.12.1
new file mode 100644
index 0000000..1cb4dd7
--- /dev/null
+++ b/dist/changes-5.12.1
@@ -0,0 +1,20 @@
+Qt 5.12.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0.
+
+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.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.
-- 
cgit v1.2.3


From 2c15783c02e3abfc3c528d270c448d1d555c8036 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Wed, 9 Jan 2019 13:55:22 +0100
Subject: Support the import of from 1.0 to 1.QT_VERSION_MINOR-1

Task-number: QTBUG-72270
Change-Id: Id13708b1f4ef5c890037dac8b6225c3e096d88b0
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 src/effects/plugin.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/effects/plugin.cpp b/src/effects/plugin.cpp
index 7b33636..cdd3a80 100644
--- a/src/effects/plugin.cpp
+++ b/src/effects/plugin.cpp
@@ -54,6 +54,8 @@ public:
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtGraphicalEffects"));
 
+        qmlRegisterModule(uri, 1, 0);
+
         // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.12 onward
         qmlRegisterModule(uri, 1, QT_VERSION_MINOR);
     }
-- 
cgit v1.2.3