diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:40:22 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:41:26 +0100 |
commit | 586476ff2ce59ba4ea2cee2ab59818e0bda4b90c (patch) | |
tree | 31f36111479be2c950ac1777889cb9c2fa82c280 | |
parent | 918427086bc3ec992dc8952c33ee743c8a5b92cc (diff) | |
parent | 66031e932c321ccb936e254b5d1810fa633c6cb0 (diff) | |
download | qtgraphicaleffects-586476ff2ce59ba4ea2cee2ab59818e0bda4b90c.tar.gz |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I56e694eec6b9196e1e5db256569b95cf580d5735
-rw-r--r-- | dist/changes-5.9.3 | 24 | ||||
-rw-r--r-- | dist/changes-5.9.4 | 25 | ||||
-rw-r--r-- | src/effects/plugin.cpp | 1 |
3 files changed, 50 insertions, 0 deletions
diff --git a/dist/changes-5.9.3 b/dist/changes-5.9.3 new file mode 100644 index 0000000..bb5db63 --- /dev/null +++ b/dist/changes-5.9.3 @@ -0,0 +1,24 @@ +Qt 5.9.3 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.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.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +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. + +**************************************************************************** +* Qt 5.9.3 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4 new file mode 100644 index 0000000..1014937 --- /dev/null +++ b/dist/changes-5.9.4 @@ -0,0 +1,25 @@ +Qt 5.9.4 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.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.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +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. + +**************************************************************************** +* Qt 5.9.4 Changes * +**************************************************************************** + + - This release does not contain any changes to this module. + diff --git a/src/effects/plugin.cpp b/src/effects/plugin.cpp index 36ead7a..b30e2ae 100644 --- a/src/effects/plugin.cpp +++ b/src/effects/plugin.cpp @@ -45,6 +45,7 @@ static void initResources() { #ifdef QT_STATIC Q_INIT_RESOURCE(qmake_QtGraphicalEffects); + Q_INIT_RESOURCE(qtgraphicaleffectsshaders); #endif } |