Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4

 Conflicts:
	.qmake.conf
	src/effects/private/qgfxshaderbuilder_p.h

Change-Id: I27fbd2a8d7bf5bd89d94925a2da9ae3aa0748f42

9 files changed, 57 insertions, 9 deletions

diff --git a/dist/changes-5.6.3 b/dist/changes-5.6.3
new file mode 100644
index 0000000..285d4a8
--- /dev/null
+++ b/dist/changes-5.6.3
@@ -0,0 +1,12 @@
+Qt 5.6.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.6.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.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+There were no changes in this module since previous release.
diff --git a/dist/changes-5.9.2 b/dist/changes-5.9.2
new file mode 100644
index 0000000..1671a60
--- /dev/null
+++ b/dist/changes-5.9.2
@@ -0,0 +1,25 @@
+Qt 5.9.2 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.2 Changes                           *
+****************************************************************************
+
+- [QTBUG-57205] Ensure correct detection of dependencies for GaussianBlur
+  in qmlimportscanner.
diff --git a/src/effects/Colorize.qml b/src/effects/Colorize.qml
index d36dea3..fd40da2 100644
--- a/src/effects/Colorize.qml
+++ b/src/effects/Colorize.qml
@@ -68,7 +68,7 @@ import QtGraphicalEffects.private 1.0
     \endtable
 
     \note This effect is available when running with OpenGL.
-    s
+
     \section1 Example
 
     The following example shows how to apply the effect.
diff --git a/src/effects/DropShadow.qml b/src/effects/DropShadow.qml
index dc5b4fa..065a489 100644
--- a/src/effects/DropShadow.qml
+++ b/src/effects/DropShadow.qml
@@ -273,7 +273,7 @@ Item {
     property alias verticalOffset: dbs.verticalOffset
 
     /*!
-        This property defines how large part of the shadow color is strenghtened
+        This property defines how large part of the shadow color is strengthened
         near the source edges.
 
         The value ranges from 0.0 to 1.0. By default, the property is set to \c
diff --git a/src/effects/Glow.qml b/src/effects/Glow.qml
index 168fc44..73ea4cf 100644
--- a/src/effects/Glow.qml
+++ b/src/effects/Glow.qml
@@ -52,7 +52,7 @@ import QtGraphicalEffects.private 1.0
     The Glow effect blurs the alpha channel of the source and colorizes it
     with \l {Glow::color}{color} and places it behind the source, resulting in a halo or glow
     around the object. The quality of the blurred edge can be controlled using
-    \l samples and \l radius and the strenght of the glow can be changed using
+    \l samples and \l radius and the strength of the glow can be changed using
     \l spread.
 
     \table
@@ -171,7 +171,7 @@ Item {
     property alias samples: dps.samples
 
     /*!
-        This property defines how large part of the glow color is strenghtened
+        This property defines how large part of the glow color is strengthened
         near the source edges.
 
         The values range from 0.0 to 1.0. By default, the property is set to \c
diff --git a/src/effects/InnerShadow.qml b/src/effects/InnerShadow.qml
index acc47fb..f8f009f 100644
--- a/src/effects/InnerShadow.qml
+++ b/src/effects/InnerShadow.qml
@@ -155,7 +155,7 @@ Item {
     property int samples: 0
 
     /*!
-        This property defines how large part of the shadow color is strenghtened
+        This property defines how large part of the shadow color is strengthened
         near the source edges.
 
         The value ranges from 0.0 to 1.0. By default, the property is set to \c
diff --git a/src/effects/RectangularGlow.qml b/src/effects/RectangularGlow.qml
index f8971c0..cd6aad0 100644
--- a/src/effects/RectangularGlow.qml
+++ b/src/effects/RectangularGlow.qml
@@ -109,11 +109,11 @@ Item {
     property real glowRadius: 0.0
 
     /*!
-        This property defines how large part of the glow color is strenghtened
+        This property defines how large part of the glow color is strengthened
         near the source edges.
 
-        The value ranges from 0.0 (no strenght increase) to 1.0 (maximum
-        strenght increase). By default, the property is set to \c 0.0.
+        The value ranges from 0.0 (no strength increase) to 1.0 (maximum
+        strength increase). By default, the property is set to \c 0.0.
 
         \table
         \header
diff --git a/src/effects/plugins.qmltypes b/src/effects/plugins.qmltypes
new file mode 100644
index 0000000..8cbeeb7
--- /dev/null
+++ b/src/effects/plugins.qmltypes
@@ -0,0 +1,11 @@
+import QtQuick.tooling 1.2
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable QtGraphicalEffects 1.0'
+
+Module {
+    dependencies: ["QtQuick 2.0", "QtQuick.Window 2.1"]
+}
diff --git a/src/effects/private/qgfxshaderbuilder_p.h b/src/effects/private/qgfxshaderbuilder_p.h
index 59aea2c..4750f57 100644
--- a/src/effects/private/qgfxshaderbuilder_p.h
+++ b/src/effects/private/qgfxshaderbuilder_p.h
@@ -57,7 +57,7 @@ public:
     Q_INVOKABLE QVariantMap gaussianBlur(const QJSValue &parameters);
 
 private:
-    int m_maxBlurSamples;
+    int m_maxBlurSamples = 0;
     bool m_coreProfile;
 };