Merge 5.12 into 5.12.0

Change-Id: I8a0e5853af30d185e426000561057210f432ac3d

84 files changed, 160 insertions, 150 deletions

diff --git a/src/effects/Blend.qml b/src/effects/Blend.qml
index f607f4e..e5f4816 100644
--- a/src/effects/Blend.qml
+++ b/src/effects/Blend.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype Blend
diff --git a/src/effects/BrightnessContrast.qml b/src/effects/BrightnessContrast.qml
index c425bfa..a95872c 100644
--- a/src/effects/BrightnessContrast.qml
+++ b/src/effects/BrightnessContrast.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype BrightnessContrast
diff --git a/src/effects/ColorOverlay.qml b/src/effects/ColorOverlay.qml
index 32314bd..b2cdaa0 100644
--- a/src/effects/ColorOverlay.qml
+++ b/src/effects/ColorOverlay.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype ColorOverlay
diff --git a/src/effects/Colorize.qml b/src/effects/Colorize.qml
index a4cf524..501111f 100644
--- a/src/effects/Colorize.qml
+++ b/src/effects/Colorize.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype Colorize
diff --git a/src/effects/ConicalGradient.qml b/src/effects/ConicalGradient.qml
index ca65151..c8d68b1 100644
--- a/src/effects/ConicalGradient.qml
+++ b/src/effects/ConicalGradient.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype ConicalGradient
diff --git a/src/effects/Desaturate.qml b/src/effects/Desaturate.qml
index 93e1256..3347e2f 100644
--- a/src/effects/Desaturate.qml
+++ b/src/effects/Desaturate.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype Desaturate
diff --git a/src/effects/DirectionalBlur.qml b/src/effects/DirectionalBlur.qml
index 7525dbc..42ea078 100644
--- a/src/effects/DirectionalBlur.qml
+++ b/src/effects/DirectionalBlur.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype DirectionalBlur
diff --git a/src/effects/Displace.qml b/src/effects/Displace.qml
index 0ef5d96..3400222 100644
--- a/src/effects/Displace.qml
+++ b/src/effects/Displace.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype Displace
diff --git a/src/effects/DropShadow.qml b/src/effects/DropShadow.qml
index 0668a80..0f30e5a 100644
--- a/src/effects/DropShadow.qml
+++ b/src/effects/DropShadow.qml
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype DropShadow
diff --git a/src/effects/FastBlur.qml b/src/effects/FastBlur.qml
index 9c4c88b..1d8a547 100644
--- a/src/effects/FastBlur.qml
+++ b/src/effects/FastBlur.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype FastBlur
diff --git a/src/effects/GammaAdjust.qml b/src/effects/GammaAdjust.qml
index 419c9a0..3b35ab5 100644
--- a/src/effects/GammaAdjust.qml
+++ b/src/effects/GammaAdjust.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype GammaAdjust
diff --git a/src/effects/GaussianBlur.qml b/src/effects/GaussianBlur.qml
index 579682a..7619550 100644
--- a/src/effects/GaussianBlur.qml
+++ b/src/effects/GaussianBlur.qml
@@ -38,9 +38,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Window 2.1
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtQuick.Window 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype GaussianBlur
diff --git a/src/effects/Glow.qml b/src/effects/Glow.qml
index f8d7bc0..ad00571 100644
--- a/src/effects/Glow.qml
+++ b/src/effects/Glow.qml
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype Glow
diff --git a/src/effects/HueSaturation.qml b/src/effects/HueSaturation.qml
index 408d449..526f474 100644
--- a/src/effects/HueSaturation.qml
+++ b/src/effects/HueSaturation.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype HueSaturation
diff --git a/src/effects/InnerShadow.qml b/src/effects/InnerShadow.qml
index f8f009f..7a388e3 100644
--- a/src/effects/InnerShadow.qml
+++ b/src/effects/InnerShadow.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype InnerShadow
diff --git a/src/effects/LevelAdjust.qml b/src/effects/LevelAdjust.qml
index 89aa3d7..004c798 100644
--- a/src/effects/LevelAdjust.qml
+++ b/src/effects/LevelAdjust.qml
@@ -37,8 +37,8 @@
 **
 *****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype LevelAdjust
@@ -84,7 +84,9 @@ Item {
         This property defines the change factor for how the value of each pixel
         color channel is altered according to the equation:
 
-        \code result.rgb = pow(original.rgb, 1.0 / gamma.rgb); \endcode
+        \code
+        result.rgb = pow(original.rgb, 1.0 / gamma.rgb);
+        \endcode
 
         Setting the gamma values under QtVector3d(1.0, 1.0, 1.0) makes the image
         darker, the values above QtVector3d(1.0, 1.0, 1.0) lighten it.
diff --git a/src/effects/LinearGradient.qml b/src/effects/LinearGradient.qml
index e268f8e..1f73a21 100644
--- a/src/effects/LinearGradient.qml
+++ b/src/effects/LinearGradient.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype LinearGradient
diff --git a/src/effects/MaskedBlur.qml b/src/effects/MaskedBlur.qml
index d3b87bd..d777b0a 100644
--- a/src/effects/MaskedBlur.qml
+++ b/src/effects/MaskedBlur.qml
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype MaskedBlur
diff --git a/src/effects/OpacityMask.qml b/src/effects/OpacityMask.qml
index 3935141..7dffb6d 100644
--- a/src/effects/OpacityMask.qml
+++ b/src/effects/OpacityMask.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype OpacityMask
diff --git a/src/effects/RadialBlur.qml b/src/effects/RadialBlur.qml
index 5530625..71d3b64 100644
--- a/src/effects/RadialBlur.qml
+++ b/src/effects/RadialBlur.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype RadialBlur
diff --git a/src/effects/RadialGradient.qml b/src/effects/RadialGradient.qml
index 287b26f..ff46aac 100644
--- a/src/effects/RadialGradient.qml
+++ b/src/effects/RadialGradient.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype RadialGradient
diff --git a/src/effects/RectangularGlow.qml b/src/effects/RectangularGlow.qml
index cd6aad0..62862e3 100644
--- a/src/effects/RectangularGlow.qml
+++ b/src/effects/RectangularGlow.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype RectangularGlow
diff --git a/src/effects/RecursiveBlur.qml b/src/effects/RecursiveBlur.qml
index 458dc65..7d93802 100644
--- a/src/effects/RecursiveBlur.qml
+++ b/src/effects/RecursiveBlur.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype RecursiveBlur
diff --git a/src/effects/ThresholdMask.qml b/src/effects/ThresholdMask.qml
index 36e0365..204d8c9 100644
--- a/src/effects/ThresholdMask.qml
+++ b/src/effects/ThresholdMask.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype ThresholdMask
diff --git a/src/effects/ZoomBlur.qml b/src/effects/ZoomBlur.qml
index 32e7be5..66ba710 100644
--- a/src/effects/ZoomBlur.qml
+++ b/src/effects/ZoomBlur.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 /*!
     \qmltype ZoomBlur
diff --git a/src/effects/plugin.cpp b/src/effects/plugin.cpp
index d2baba2..7b33636 100644
--- a/src/effects/plugin.cpp
+++ b/src/effects/plugin.cpp
@@ -53,7 +53,9 @@ public:
     virtual void registerTypes(const char *uri)
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtGraphicalEffects"));
-        Q_UNUSED(uri);
+
+        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.12 onward
+        qmlRegisterModule(uri, 1, QT_VERSION_MINOR);
     }
 };
 
diff --git a/src/effects/private/DropShadowBase.qml b/src/effects/private/DropShadowBase.qml
index e6d83df..7e80e47 100644
--- a/src/effects/private/DropShadowBase.qml
+++ b/src/effects/private/DropShadowBase.qml
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
+import QtGraphicalEffects 1.12
 
 Item {
     id: root
diff --git a/src/effects/private/FastGlow.qml b/src/effects/private/FastGlow.qml
index fb2fa42..5c737f1 100644
--- a/src/effects/private/FastGlow.qml
+++ b/src/effects/private/FastGlow.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 Item {
     id: rootItem
diff --git a/src/effects/private/FastInnerShadow.qml b/src/effects/private/FastInnerShadow.qml
index be21d8e..bd361ca 100644
--- a/src/effects/private/FastInnerShadow.qml
+++ b/src/effects/private/FastInnerShadow.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 Item {
     id: rootItem
diff --git a/src/effects/private/FastMaskedBlur.qml b/src/effects/private/FastMaskedBlur.qml
index ef26704..56800c6 100644
--- a/src/effects/private/FastMaskedBlur.qml
+++ b/src/effects/private/FastMaskedBlur.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 Item {
     id: rootItem
diff --git a/src/effects/private/GaussianDirectionalBlur.qml b/src/effects/private/GaussianDirectionalBlur.qml
index af1ca70..4d52b2e 100644
--- a/src/effects/private/GaussianDirectionalBlur.qml
+++ b/src/effects/private/GaussianDirectionalBlur.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 Item {
     id: rootItem
diff --git a/src/effects/private/GaussianGlow.qml b/src/effects/private/GaussianGlow.qml
index d660205..f0d328a 100644
--- a/src/effects/private/GaussianGlow.qml
+++ b/src/effects/private/GaussianGlow.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 Item {
     id: rootItem
diff --git a/src/effects/private/GaussianInnerShadow.qml b/src/effects/private/GaussianInnerShadow.qml
index 7207963..a0b39e9 100644
--- a/src/effects/private/GaussianInnerShadow.qml
+++ b/src/effects/private/GaussianInnerShadow.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 Item {
     id: rootItem
diff --git a/src/effects/private/GaussianMaskedBlur.qml b/src/effects/private/GaussianMaskedBlur.qml
index 03bf674..8273973 100644
--- a/src/effects/private/GaussianMaskedBlur.qml
+++ b/src/effects/private/GaussianMaskedBlur.qml
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects.private 1.0
+import QtQuick 2.12
+import QtGraphicalEffects.private 1.12
 
 Item {
     id: rootItem
diff --git a/src/effects/private/plugin.cpp b/src/effects/private/plugin.cpp
index a9deb94..5537ba8 100644
--- a/src/effects/private/plugin.cpp
+++ b/src/effects/private/plugin.cpp
@@ -63,6 +63,9 @@ public:
         Q_ASSERT(QByteArray(uri) == QByteArrayLiteral("QtGraphicalEffects.private"));
         qmlRegisterType<QGfxSourceProxy>(uri, 1, 0, "SourceProxy");
         qmlRegisterSingletonType<QGfxShaderBuilder>(uri, 1, 0, "ShaderBuilder", qgfxshaderbuilder_provider);
+
+        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.12 onward
+        qmlRegisterModule(uri, 1, QT_VERSION_MINOR);
     }
 };
 
diff --git a/tests/manual/SourceProxyTest.qml b/tests/manual/SourceProxyTest.qml
index b3e3066..311f543 100644
--- a/tests/manual/SourceProxyTest.qml
+++ b/tests/manual/SourceProxyTest.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtGraphicalEffects.private 1.0
-import QtQuick 2.4
+import QtGraphicalEffects.private 1.12
+import QtQuick 2.12
 
 Rectangle {
 
diff --git a/tests/manual/smooth/CellContainer.qml b/tests/manual/smooth/CellContainer.qml
index 5a04bd3..60af0f7 100644
--- a/tests/manual/smooth/CellContainer.qml
+++ b/tests/manual/smooth/CellContainer.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.9
-import QtQuick.Layouts 1.3
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
 
 Item {
     implicitWidth: children[0].implicitWidth * children[0].scale
diff --git a/tests/manual/smooth/SourceImage.qml b/tests/manual/smooth/SourceImage.qml
index 7956190..86cf269 100644
--- a/tests/manual/smooth/SourceImage.qml
+++ b/tests/manual/smooth/SourceImage.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.12
 
 Image {
     source: "star.png"
diff --git a/tests/manual/smooth/main.qml b/tests/manual/smooth/main.qml
index 36bfb12..3c458cc 100644
--- a/tests/manual/smooth/main.qml
+++ b/tests/manual/smooth/main.qml
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.9
-import QtQuick.Window 2.3
-import QtQuick.Layouts 1.3
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtQuick.Window 2.12
+import QtQuick.Layouts 1.12
+import QtGraphicalEffects 1.12
 
 /*
     A testbench for source items (and effects) that set smooth to false.
diff --git a/tests/manual/testSourceProxy.qml b/tests/manual/testSourceProxy.qml
index c7f9e54..dcdae6f 100644
--- a/tests/manual/testSourceProxy.qml
+++ b/tests/manual/testSourceProxy.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtGraphicalEffects.private 1.0
-import QtQuick 2.4;
+import QtGraphicalEffects.private 1.12
+import QtQuick 2.12
 
 Item {
     id: root
diff --git a/tests/manual/testbed/BGColorPicker.qml b/tests/manual/testbed/BGColorPicker.qml
index 2309182..0b06a8d 100644
--- a/tests/manual/testbed/BGColorPicker.qml
+++ b/tests/manual/testbed/BGColorPicker.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Label {
     id: bgColorPicker
diff --git a/tests/manual/testbed/CheckBox.qml b/tests/manual/testbed/CheckBox.qml
index 5311507..2bd3fb6 100644
--- a/tests/manual/testbed/CheckBox.qml
+++ b/tests/manual/testbed/CheckBox.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Item {
     id: checkBox
diff --git a/tests/manual/testbed/ColorPicker.qml b/tests/manual/testbed/ColorPicker.qml
index e1b4ebb..7181192 100644
--- a/tests/manual/testbed/ColorPicker.qml
+++ b/tests/manual/testbed/ColorPicker.qml
@@ -26,7 +26,7 @@
 **
 *****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Item {
     id: root
diff --git a/tests/manual/testbed/ColorSlider.qml b/tests/manual/testbed/ColorSlider.qml
index 61130fc..bdddac9 100644
--- a/tests/manual/testbed/ColorSlider.qml
+++ b/tests/manual/testbed/ColorSlider.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Item {
     id: colorSlider
diff --git a/tests/manual/testbed/Control.qml b/tests/manual/testbed/Control.qml
index 91a19e6..dcc7257 100644
--- a/tests/manual/testbed/Control.qml
+++ b/tests/manual/testbed/Control.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Item {
     id: control
diff --git a/tests/manual/testbed/ImageSource.qml b/tests/manual/testbed/ImageSource.qml
index 2322100..520eacd 100644
--- a/tests/manual/testbed/ImageSource.qml
+++ b/tests/manual/testbed/ImageSource.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Image {
     id: is
diff --git a/tests/manual/testbed/Label.qml b/tests/manual/testbed/Label.qml
index 75c66ae..6a5964c 100644
--- a/tests/manual/testbed/Label.qml
+++ b/tests/manual/testbed/Label.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Item {
     id: label
diff --git a/tests/manual/testbed/LevelSlider.qml b/tests/manual/testbed/LevelSlider.qml
index 8e78c10..f13928c 100644
--- a/tests/manual/testbed/LevelSlider.qml
+++ b/tests/manual/testbed/LevelSlider.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Item {
     id: slider
diff --git a/tests/manual/testbed/PositionPicker.qml b/tests/manual/testbed/PositionPicker.qml
index 5994d14..2b85b36 100644
--- a/tests/manual/testbed/PositionPicker.qml
+++ b/tests/manual/testbed/PositionPicker.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Image {
     id: positionPicker
diff --git a/tests/manual/testbed/ProgressBar.qml b/tests/manual/testbed/ProgressBar.qml
index 00f5286..067edfb 100644
--- a/tests/manual/testbed/ProgressBar.qml
+++ b/tests/manual/testbed/ProgressBar.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Item {
     id: slider
diff --git a/tests/manual/testbed/RadioButton.qml b/tests/manual/testbed/RadioButton.qml
index bd148c8..1ab809d 100644
--- a/tests/manual/testbed/RadioButton.qml
+++ b/tests/manual/testbed/RadioButton.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Item {
     id: radioButton
diff --git a/tests/manual/testbed/RadioButtonColumn.qml b/tests/manual/testbed/RadioButtonColumn.qml
index 97d94d7..3a16386 100644
--- a/tests/manual/testbed/RadioButtonColumn.qml
+++ b/tests/manual/testbed/RadioButtonColumn.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Item {
     id: radioButtoncolumn
diff --git a/tests/manual/testbed/RgbaColorPicker.qml b/tests/manual/testbed/RgbaColorPicker.qml
index 749c201..0b48e95 100644
--- a/tests/manual/testbed/RgbaColorPicker.qml
+++ b/tests/manual/testbed/RgbaColorPicker.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Item {
     id: rgbaSlider
diff --git a/tests/manual/testbed/Slider.qml b/tests/manual/testbed/Slider.qml
index 1de643f..a199a7f 100644
--- a/tests/manual/testbed/Slider.qml
+++ b/tests/manual/testbed/Slider.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Item {
     id: slider
diff --git a/tests/manual/testbed/TestBedModel.qml b/tests/manual/testbed/TestBedModel.qml
index 641eeef..c299c39 100644
--- a/tests/manual/testbed/TestBedModel.qml
+++ b/tests/manual/testbed/TestBedModel.qml
@@ -26,7 +26,7 @@
 **
 *****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 ListModel {
     id: testcaseModel
diff --git a/tests/manual/testbed/TestBlend.qml b/tests/manual/testbed/TestBlend.qml
index 86e2bf4..c3852e1 100644
--- a/tests/manual/testbed/TestBlend.qml
+++ b/tests/manual/testbed/TestBlend.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestBrightnessContrast.qml b/tests/manual/testbed/TestBrightnessContrast.qml
index 387fc7c..20ce6cd 100644
--- a/tests/manual/testbed/TestBrightnessContrast.qml
+++ b/tests/manual/testbed/TestBrightnessContrast.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestCaseTemplate.qml b/tests/manual/testbed/TestCaseTemplate.qml
index 93e50de..6d15829 100644
--- a/tests/manual/testbed/TestCaseTemplate.qml
+++ b/tests/manual/testbed/TestCaseTemplate.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Item {
     id: main
diff --git a/tests/manual/testbed/TestColorOverlay.qml b/tests/manual/testbed/TestColorOverlay.qml
index 6200b1e..112aa35 100644
--- a/tests/manual/testbed/TestColorOverlay.qml
+++ b/tests/manual/testbed/TestColorOverlay.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestColorize.qml b/tests/manual/testbed/TestColorize.qml
index 79d99c6..fed0d15 100644
--- a/tests/manual/testbed/TestColorize.qml
+++ b/tests/manual/testbed/TestColorize.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestConicalGradient.qml b/tests/manual/testbed/TestConicalGradient.qml
index 7c53bd1..8c7b145 100644
--- a/tests/manual/testbed/TestConicalGradient.qml
+++ b/tests/manual/testbed/TestConicalGradient.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestDesaturate.qml b/tests/manual/testbed/TestDesaturate.qml
index ea900b9..465a833 100644
--- a/tests/manual/testbed/TestDesaturate.qml
+++ b/tests/manual/testbed/TestDesaturate.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestDirectionalBlur.qml b/tests/manual/testbed/TestDirectionalBlur.qml
index 3b3ba89..a3455e8 100644
--- a/tests/manual/testbed/TestDirectionalBlur.qml
+++ b/tests/manual/testbed/TestDirectionalBlur.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestDisplace.qml b/tests/manual/testbed/TestDisplace.qml
index 76bff5b..1aca077 100644
--- a/tests/manual/testbed/TestDisplace.qml
+++ b/tests/manual/testbed/TestDisplace.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
 
diff --git a/tests/manual/testbed/TestDropShadow.qml b/tests/manual/testbed/TestDropShadow.qml
index a74ad4b..93070be 100644
--- a/tests/manual/testbed/TestDropShadow.qml
+++ b/tests/manual/testbed/TestDropShadow.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
 
diff --git a/tests/manual/testbed/TestFastBlur.qml b/tests/manual/testbed/TestFastBlur.qml
index 459d196..70fb577 100644
--- a/tests/manual/testbed/TestFastBlur.qml
+++ b/tests/manual/testbed/TestFastBlur.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestGammaAdjust.qml b/tests/manual/testbed/TestGammaAdjust.qml
index 400b3fb..9ea307e 100644
--- a/tests/manual/testbed/TestGammaAdjust.qml
+++ b/tests/manual/testbed/TestGammaAdjust.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestGaussianBlur.qml b/tests/manual/testbed/TestGaussianBlur.qml
index 196933d..13ce7fc 100644
--- a/tests/manual/testbed/TestGaussianBlur.qml
+++ b/tests/manual/testbed/TestGaussianBlur.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestGlow.qml b/tests/manual/testbed/TestGlow.qml
index b82c4ef..997a838 100644
--- a/tests/manual/testbed/TestGlow.qml
+++ b/tests/manual/testbed/TestGlow.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
 
diff --git a/tests/manual/testbed/TestHueSaturation.qml b/tests/manual/testbed/TestHueSaturation.qml
index 3b1b954..4124767 100644
--- a/tests/manual/testbed/TestHueSaturation.qml
+++ b/tests/manual/testbed/TestHueSaturation.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestInnerShadow.qml b/tests/manual/testbed/TestInnerShadow.qml
index 38426ad..d17be5f 100644
--- a/tests/manual/testbed/TestInnerShadow.qml
+++ b/tests/manual/testbed/TestInnerShadow.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
 
diff --git a/tests/manual/testbed/TestLevelAdjust.qml b/tests/manual/testbed/TestLevelAdjust.qml
index 713a044..7e1b976 100644
--- a/tests/manual/testbed/TestLevelAdjust.qml
+++ b/tests/manual/testbed/TestLevelAdjust.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestLinearGradient.qml b/tests/manual/testbed/TestLinearGradient.qml
index 63cfd3d..500dd5a 100644
--- a/tests/manual/testbed/TestLinearGradient.qml
+++ b/tests/manual/testbed/TestLinearGradient.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestMaskedBlur.qml b/tests/manual/testbed/TestMaskedBlur.qml
index 1d37b24..c8b6b2d 100644
--- a/tests/manual/testbed/TestMaskedBlur.qml
+++ b/tests/manual/testbed/TestMaskedBlur.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestOpacityMask.qml b/tests/manual/testbed/TestOpacityMask.qml
index a844911..12b1b0c 100644
--- a/tests/manual/testbed/TestOpacityMask.qml
+++ b/tests/manual/testbed/TestOpacityMask.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestRadialBlur.qml b/tests/manual/testbed/TestRadialBlur.qml
index 7f80d56..c2e0d95 100644
--- a/tests/manual/testbed/TestRadialBlur.qml
+++ b/tests/manual/testbed/TestRadialBlur.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestRadialGradient.qml b/tests/manual/testbed/TestRadialGradient.qml
index 6ab565d..af17b5f 100644
--- a/tests/manual/testbed/TestRadialGradient.qml
+++ b/tests/manual/testbed/TestRadialGradient.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/TestRectangularGlow.qml b/tests/manual/testbed/TestRectangularGlow.qml
index 79841bc..fd5a3a0 100644
--- a/tests/manual/testbed/TestRectangularGlow.qml
+++ b/tests/manual/testbed/TestRectangularGlow.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
 
diff --git a/tests/manual/testbed/TestRecursiveBlur.qml b/tests/manual/testbed/TestRecursiveBlur.qml
index 1b9c77d..5e33ea3 100644
--- a/tests/manual/testbed/TestRecursiveBlur.qml
+++ b/tests/manual/testbed/TestRecursiveBlur.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
 
diff --git a/tests/manual/testbed/TestThresholdMask.qml b/tests/manual/testbed/TestThresholdMask.qml
index b4fbc73..97bead2 100644
--- a/tests/manual/testbed/TestThresholdMask.qml
+++ b/tests/manual/testbed/TestThresholdMask.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
    ImageSource {
diff --git a/tests/manual/testbed/TestZoomBlur.qml b/tests/manual/testbed/TestZoomBlur.qml
index 4a804d2..3045e15 100644
--- a/tests/manual/testbed/TestZoomBlur.qml
+++ b/tests/manual/testbed/TestZoomBlur.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 TestCaseTemplate {
     ImageSource {
diff --git a/tests/manual/testbed/testBed.qml b/tests/manual/testbed/testBed.qml
index c3e5b91..b74bd1a 100644
--- a/tests/manual/testbed/testBed.qml
+++ b/tests/manual/testbed/testBed.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.12
 
 Rectangle {
     id: main
diff --git a/tools/pngdumper/pngdumper.qml b/tools/pngdumper/pngdumper.qml
index 3b6fdc5..fa2faaf 100644
--- a/tools/pngdumper/pngdumper.qml
+++ b/tools/pngdumper/pngdumper.qml
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import org.qtproject.pngdumper 1.0
+import QtQuick 2.12
+import org.qtproject.pngdumper 1.12
 
 Rectangle {
     id: main
diff --git a/tools/pngdumper/pngdumper_plugin.cpp b/tools/pngdumper/pngdumper_plugin.cpp
index e9b6912..caf6565 100644
--- a/tools/pngdumper/pngdumper_plugin.cpp
+++ b/tools/pngdumper/pngdumper_plugin.cpp
@@ -34,5 +34,8 @@
 void ItemcapturerPlugin::registerTypes(const char *uri)
 {
     qmlRegisterType<ItemCapturer>(uri, 1, 0, "ItemCapturer");
+
+    // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.12 onward
+    qmlRegisterModule(uri, 1, QT_VERSION_MINOR);
 }