diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-09 22:14:43 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-09 22:14:43 +0100 |
commit | 43564140cb702994971f7c5fff3227f700c32995 (patch) | |
tree | 4d378d1aaf4c723c817426b67f0c414ad64fa03e | |
parent | cdb0a5dddf84e27dda294cecebd64c282227f162 (diff) | |
parent | 2c15783c02e3abfc3c528d270c448d1d555c8036 (diff) |
Merge remote-tracking branch 'origin/5.12.1' into 5.12
Change-Id: Ib7e7fc1cbe344cd4fe66a3a2be0d591c22509b47
-rw-r--r-- | dist/changes-5.12.1 | 20 | ||||
-rw-r--r-- | src/effects/doc/src/qtgraphicaleffects.qdoc | 4 | ||||
-rw-r--r-- | src/effects/plugin.cpp | 2 |
3 files changed, 24 insertions, 2 deletions
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. 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. */ /*! 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); } |