Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	.qmake.conf

Change-Id: Ie64aa3089d47063e82f8d1cb77929deee86c62ea

25 files changed, 25 insertions, 25 deletions

diff --git a/src/effects/Blend.qml b/src/effects/Blend.qml
index 59d8646..27597bc 100644
--- a/src/effects/Blend.qml
+++ b/src/effects/Blend.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype Blend
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-blend
diff --git a/src/effects/BrightnessContrast.qml b/src/effects/BrightnessContrast.qml
index db53acb..5d27aa3 100644
--- a/src/effects/BrightnessContrast.qml
+++ b/src/effects/BrightnessContrast.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype BrightnessContrast
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-color
diff --git a/src/effects/ColorOverlay.qml b/src/effects/ColorOverlay.qml
index fedc050..3bd0f2a 100644
--- a/src/effects/ColorOverlay.qml
+++ b/src/effects/ColorOverlay.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype ColorOverlay
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-color
diff --git a/src/effects/Colorize.qml b/src/effects/Colorize.qml
index 62e1312..0f5bae2 100644
--- a/src/effects/Colorize.qml
+++ b/src/effects/Colorize.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype Colorize
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-color
diff --git a/src/effects/ConicalGradient.qml b/src/effects/ConicalGradient.qml
index c2492f4..af3e865 100644
--- a/src/effects/ConicalGradient.qml
+++ b/src/effects/ConicalGradient.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype ConicalGradient
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-gradient
diff --git a/src/effects/Desaturate.qml b/src/effects/Desaturate.qml
index a05cb59..1d09bb2 100644
--- a/src/effects/Desaturate.qml
+++ b/src/effects/Desaturate.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype Desaturate
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-color
diff --git a/src/effects/DirectionalBlur.qml b/src/effects/DirectionalBlur.qml
index 248e0c5..799b55a 100644
--- a/src/effects/DirectionalBlur.qml
+++ b/src/effects/DirectionalBlur.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype DirectionalBlur
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-motion-blur
diff --git a/src/effects/Displace.qml b/src/effects/Displace.qml
index 142ae10..7f51151 100644
--- a/src/effects/Displace.qml
+++ b/src/effects/Displace.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype Displace
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-distortion
diff --git a/src/effects/DropShadow.qml b/src/effects/DropShadow.qml
index 0a76a58..5532168 100644
--- a/src/effects/DropShadow.qml
+++ b/src/effects/DropShadow.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype DropShadow
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-drop-shadow
diff --git a/src/effects/FastBlur.qml b/src/effects/FastBlur.qml
index ca38ad2..06c17b4 100644
--- a/src/effects/FastBlur.qml
+++ b/src/effects/FastBlur.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype FastBlur
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-blur
diff --git a/src/effects/GammaAdjust.qml b/src/effects/GammaAdjust.qml
index 7a597dd..db67064 100644
--- a/src/effects/GammaAdjust.qml
+++ b/src/effects/GammaAdjust.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype GammaAdjust
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-color
diff --git a/src/effects/GaussianBlur.qml b/src/effects/GaussianBlur.qml
index 4000179..a146e8d 100644
--- a/src/effects/GaussianBlur.qml
+++ b/src/effects/GaussianBlur.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype GaussianBlur
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-blur
diff --git a/src/effects/Glow.qml b/src/effects/Glow.qml
index 668fb74..b7da8b0 100644
--- a/src/effects/Glow.qml
+++ b/src/effects/Glow.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype Glow
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-glow
diff --git a/src/effects/HueSaturation.qml b/src/effects/HueSaturation.qml
index fb1d895..a6733be 100644
--- a/src/effects/HueSaturation.qml
+++ b/src/effects/HueSaturation.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype HueSaturation
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-color
diff --git a/src/effects/InnerShadow.qml b/src/effects/InnerShadow.qml
index 5eebc6f..90fc32b 100644
--- a/src/effects/InnerShadow.qml
+++ b/src/effects/InnerShadow.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype InnerShadow
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-drop-shadow
diff --git a/src/effects/LevelAdjust.qml b/src/effects/LevelAdjust.qml
index 5d739fb..1b60f92 100644
--- a/src/effects/LevelAdjust.qml
+++ b/src/effects/LevelAdjust.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype LevelAdjust
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-color
diff --git a/src/effects/LinearGradient.qml b/src/effects/LinearGradient.qml
index b5845ea..6b6324a 100644
--- a/src/effects/LinearGradient.qml
+++ b/src/effects/LinearGradient.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype LinearGradient
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-gradient
diff --git a/src/effects/MaskedBlur.qml b/src/effects/MaskedBlur.qml
index 4744d9f..ac3063a 100644
--- a/src/effects/MaskedBlur.qml
+++ b/src/effects/MaskedBlur.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype MaskedBlur
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-blur
diff --git a/src/effects/OpacityMask.qml b/src/effects/OpacityMask.qml
index 3a6e25a..13135e0 100644
--- a/src/effects/OpacityMask.qml
+++ b/src/effects/OpacityMask.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype OpacityMask
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-mask
diff --git a/src/effects/RadialBlur.qml b/src/effects/RadialBlur.qml
index 26315aa..6ef6ce2 100644
--- a/src/effects/RadialBlur.qml
+++ b/src/effects/RadialBlur.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype RadialBlur
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-motion-blur
diff --git a/src/effects/RadialGradient.qml b/src/effects/RadialGradient.qml
index 66c2cd6..5cf4142 100644
--- a/src/effects/RadialGradient.qml
+++ b/src/effects/RadialGradient.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype RadialGradient
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-gradient
diff --git a/src/effects/RectangularGlow.qml b/src/effects/RectangularGlow.qml
index df0d52f..e158383 100644
--- a/src/effects/RectangularGlow.qml
+++ b/src/effects/RectangularGlow.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype RectangularGlow
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-glow
diff --git a/src/effects/RecursiveBlur.qml b/src/effects/RecursiveBlur.qml
index fa59281..3798e66 100644
--- a/src/effects/RecursiveBlur.qml
+++ b/src/effects/RecursiveBlur.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype RecursiveBlur
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-blur
diff --git a/src/effects/ThresholdMask.qml b/src/effects/ThresholdMask.qml
index e789a49..259bda3 100644
--- a/src/effects/ThresholdMask.qml
+++ b/src/effects/ThresholdMask.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype ThresholdMask
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-mask
diff --git a/src/effects/ZoomBlur.qml b/src/effects/ZoomBlur.qml
index 74a5940..975d150 100644
--- a/src/effects/ZoomBlur.qml
+++ b/src/effects/ZoomBlur.qml
@@ -43,7 +43,7 @@ import "private"
 
 /*!
     \qmltype ZoomBlur
-    \inqmlmodule QtGraphicalEffects 1.0
+    \inqmlmodule QtGraphicalEffects
     \since QtGraphicalEffects 1.0
     \inherits QtQuick2::Item
     \ingroup qtgraphicaleffects-motion-blur