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

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