diff options
author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:23:28 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 13:19:00 +0200 |
commit | 045174c411f89863165610c1f6135ef4bd3d0889 (patch) | |
tree | 9be08e59921b263173e7297b3a96316c73fd1c73 | |
parent | c1c259ea76c4d8c94f6d96c3fd0bbbece25785bf (diff) | |
parent | b6ff12df5496f3d296bb438ae343d5f771e93fec (diff) | |
download | qtgraphicaleffects-045174c411f89863165610c1f6135ef4bd3d0889.tar.gz |
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I7be62c2165ffc5a4bcecfb2cd291f13b1f1c609f
-rw-r--r-- | dist/changes-5.9.1 | 24 | ||||
-rw-r--r-- | src/effects/qmldir | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/dist/changes-5.9.1 b/dist/changes-5.9.1 new file mode 100644 index 0000000..e0a6a4b --- /dev/null +++ b/dist/changes-5.9.1 @@ -0,0 +1,24 @@ +Qt 5.9.1 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. + +**************************************************************************** +* Library * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/src/effects/qmldir b/src/effects/qmldir index f5012e4..72233b5 100644 --- a/src/effects/qmldir +++ b/src/effects/qmldir @@ -28,4 +28,4 @@ ThresholdMask 1.0 ThresholdMask.qml ZoomBlur 1.0 ZoomBlur.qml designersupported depends QtGraphicalEffects/private 1.0 - +depends QtQuick.Window 2.1 |