summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-01-09 22:41:30 +0100
committerLiang Qi <liang.qi@qt.io>2019-01-09 22:41:30 +0100
commit29e31fad480e097d7cca121c44fc16028ac3ffa9 (patch)
treeaeb838387527807bbe9907eea828b8c1dd6384d8
parent1f36922ea047e6a8c062318a779e9675022cb5b7 (diff)
parent43564140cb702994971f7c5fff3227f700c32995 (diff)
downloadqtgraphicaleffects-29e31fad480e097d7cca121c44fc16028ac3ffa9.tar.gz
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts: .qmake.conf Change-Id: I73721d9841e91777638474816da4e387c7c9db59
-rw-r--r--dist/changes-5.11.320
-rw-r--r--dist/changes-5.12.027
-rw-r--r--dist/changes-5.12.120
-rw-r--r--src/effects/Blend.qml4
-rw-r--r--src/effects/BrightnessContrast.qml4
-rw-r--r--src/effects/ColorOverlay.qml4
-rw-r--r--src/effects/Colorize.qml4
-rw-r--r--src/effects/ConicalGradient.qml4
-rw-r--r--src/effects/Desaturate.qml4
-rw-r--r--src/effects/DirectionalBlur.qml4
-rw-r--r--src/effects/Displace.qml4
-rw-r--r--src/effects/DropShadow.qml4
-rw-r--r--src/effects/FastBlur.qml4
-rw-r--r--src/effects/GammaAdjust.qml4
-rw-r--r--src/effects/GaussianBlur.qml6
-rw-r--r--src/effects/Glow.qml4
-rw-r--r--src/effects/HueSaturation.qml4
-rw-r--r--src/effects/InnerShadow.qml4
-rw-r--r--src/effects/LevelAdjust.qml8
-rw-r--r--src/effects/LinearGradient.qml4
-rw-r--r--src/effects/MaskedBlur.qml4
-rw-r--r--src/effects/OpacityMask.qml4
-rw-r--r--src/effects/RadialBlur.qml4
-rw-r--r--src/effects/RadialGradient.qml4
-rw-r--r--src/effects/RectangularGlow.qml4
-rw-r--r--src/effects/RecursiveBlur.qml4
-rw-r--r--src/effects/ThresholdMask.qml4
-rw-r--r--src/effects/ZoomBlur.qml4
-rw-r--r--src/effects/doc/snippets/Blend-example.qml4
-rw-r--r--src/effects/doc/snippets/BrightnessContrast-example.qml4
-rw-r--r--src/effects/doc/snippets/ColorOverlay-example.qml4
-rw-r--r--src/effects/doc/snippets/Colorize-example.qml4
-rw-r--r--src/effects/doc/snippets/ConicalGradient-example.qml4
-rw-r--r--src/effects/doc/snippets/Desaturate-example.qml4
-rw-r--r--src/effects/doc/snippets/DirectionalBlur-example.qml4
-rw-r--r--src/effects/doc/snippets/Displace-example.qml4
-rw-r--r--src/effects/doc/snippets/DropShadow-example.qml4
-rw-r--r--src/effects/doc/snippets/DropShadow-transparentBorder-example.qml4
-rw-r--r--src/effects/doc/snippets/FastBlur-example.qml4
-rw-r--r--src/effects/doc/snippets/GammaAdjust-example.qml4
-rw-r--r--src/effects/doc/snippets/GaussianBlur-example.qml4
-rw-r--r--src/effects/doc/snippets/Glow-example.qml4
-rw-r--r--src/effects/doc/snippets/Glow-transparentBorder-example.qml4
-rw-r--r--src/effects/doc/snippets/HueSaturation-example.qml4
-rw-r--r--src/effects/doc/snippets/InnerShadow-example.qml4
-rw-r--r--src/effects/doc/snippets/LevelAdjust-example.qml4
-rw-r--r--src/effects/doc/snippets/LinearGradient-example.qml4
-rw-r--r--src/effects/doc/snippets/MaskedBlur-example.qml4
-rw-r--r--src/effects/doc/snippets/OpacityMask-example.qml4
-rw-r--r--src/effects/doc/snippets/RadialBlur-example.qml4
-rw-r--r--src/effects/doc/snippets/RadialGradient-example.qml4
-rw-r--r--src/effects/doc/snippets/RectangularGlow-example.qml4
-rw-r--r--src/effects/doc/snippets/RecursiveBlur-example.qml4
-rw-r--r--src/effects/doc/snippets/ThresholdMask-example.qml4
-rw-r--r--src/effects/doc/snippets/ZoomBlur-example.qml4
-rw-r--r--src/effects/doc/src/qtgraphicaleffects.qdoc8
-rw-r--r--src/effects/plugin.cpp6
-rw-r--r--src/effects/private/DropShadowBase.qml6
-rw-r--r--src/effects/private/FastGlow.qml4
-rw-r--r--src/effects/private/FastInnerShadow.qml4
-rw-r--r--src/effects/private/FastMaskedBlur.qml4
-rw-r--r--src/effects/private/GaussianDirectionalBlur.qml4
-rw-r--r--src/effects/private/GaussianGlow.qml4
-rw-r--r--src/effects/private/GaussianInnerShadow.qml4
-rw-r--r--src/effects/private/GaussianMaskedBlur.qml4
-rw-r--r--src/effects/private/plugin.cpp3
-rw-r--r--tests/manual/SourceProxyTest.qml4
-rw-r--r--tests/manual/smooth/CellContainer.qml4
-rw-r--r--tests/manual/smooth/SourceImage.qml2
-rw-r--r--tests/manual/smooth/main.qml8
-rw-r--r--tests/manual/testSourceProxy.qml4
-rw-r--r--tests/manual/testbed/BGColorPicker.qml2
-rw-r--r--tests/manual/testbed/CheckBox.qml2
-rw-r--r--tests/manual/testbed/ColorPicker.qml2
-rw-r--r--tests/manual/testbed/ColorSlider.qml2
-rw-r--r--tests/manual/testbed/Control.qml2
-rw-r--r--tests/manual/testbed/ImageSource.qml2
-rw-r--r--tests/manual/testbed/Label.qml2
-rw-r--r--tests/manual/testbed/LevelSlider.qml2
-rw-r--r--tests/manual/testbed/PositionPicker.qml2
-rw-r--r--tests/manual/testbed/ProgressBar.qml2
-rw-r--r--tests/manual/testbed/RadioButton.qml2
-rw-r--r--tests/manual/testbed/RadioButtonColumn.qml2
-rw-r--r--tests/manual/testbed/RgbaColorPicker.qml2
-rw-r--r--tests/manual/testbed/Slider.qml2
-rw-r--r--tests/manual/testbed/TestBedModel.qml2
-rw-r--r--tests/manual/testbed/TestBlend.qml4
-rw-r--r--tests/manual/testbed/TestBrightnessContrast.qml4
-rw-r--r--tests/manual/testbed/TestCaseTemplate.qml2
-rw-r--r--tests/manual/testbed/TestColorOverlay.qml4
-rw-r--r--tests/manual/testbed/TestColorize.qml4
-rw-r--r--tests/manual/testbed/TestConicalGradient.qml4
-rw-r--r--tests/manual/testbed/TestDesaturate.qml4
-rw-r--r--tests/manual/testbed/TestDirectionalBlur.qml4
-rw-r--r--tests/manual/testbed/TestDisplace.qml4
-rw-r--r--tests/manual/testbed/TestDropShadow.qml4
-rw-r--r--tests/manual/testbed/TestFastBlur.qml4
-rw-r--r--tests/manual/testbed/TestGammaAdjust.qml4
-rw-r--r--tests/manual/testbed/TestGaussianBlur.qml4
-rw-r--r--tests/manual/testbed/TestGlow.qml4
-rw-r--r--tests/manual/testbed/TestHueSaturation.qml4
-rw-r--r--tests/manual/testbed/TestInnerShadow.qml4
-rw-r--r--tests/manual/testbed/TestLevelAdjust.qml4
-rw-r--r--tests/manual/testbed/TestLinearGradient.qml4
-rw-r--r--tests/manual/testbed/TestMaskedBlur.qml4
-rw-r--r--tests/manual/testbed/TestOpacityMask.qml4
-rw-r--r--tests/manual/testbed/TestRadialBlur.qml4
-rw-r--r--tests/manual/testbed/TestRadialGradient.qml4
-rw-r--r--tests/manual/testbed/TestRectangularGlow.qml4
-rw-r--r--tests/manual/testbed/TestRecursiveBlur.qml4
-rw-r--r--tests/manual/testbed/TestThresholdMask.qml4
-rw-r--r--tests/manual/testbed/TestZoomBlur.qml4
-rw-r--r--tests/manual/testbed/testBed.qml2
-rw-r--r--tools/pngdumper/pngdumper.qml4
-rw-r--r--tools/pngdumper/pngdumper_plugin.cpp3
115 files changed, 288 insertions, 207 deletions
diff --git a/dist/changes-5.11.3 b/dist/changes-5.11.3
new file mode 100644
index 0000000..f71fa34
--- /dev/null
+++ b/dist/changes-5.11.3
@@ -0,0 +1,20 @@
+Qt 5.11.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.11.0 through 5.11.2.
+
+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.11 series is binary compatible with the 5.10.x series.
+Applications compiled for 5.10 will continue to run with 5.11.
+
+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.
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0
new file mode 100644
index 0000000..0ca4bb5
--- /dev/null
+++ b/dist/changes-5.12.0
@@ -0,0 +1,27 @@
+Qt 5.12 introduces many new features and improvements as well as bugfixes
+over the 5.11.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+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 Graphical Effects *
+****************************************************************************
+
+ - In Qt 5.12 and newer versions, this module is available with the same
+ minor version as the Qt release minor version number. For example import
+ QtGraphicalEffects 1.12 will work in Qt 5.12, even though there has been
+ no API change, and the maximum possible import version will
+ automatically increment in future Qt versions. This is intended to
+ reduce confusion.
diff --git a/dist/changes-5.12.1 b/dist/changes-5.12.1
new file mode 100644
index 0000000..1cb4dd7
--- /dev/null
+++ b/dist/changes-5.12.1
@@ -0,0 +1,20 @@
+Qt 5.12.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.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.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+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.
+
+ - This release contains only minor code improvements.
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/doc/snippets/Blend-example.qml b/src/effects/doc/snippets/Blend-example.qml
index b09bd43..6abd534 100644
--- a/src/effects/doc/snippets/Blend-example.qml
+++ b/src/effects/doc/snippets/Blend-example.qml
@@ -38,9 +38,9 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
+import QtQuick 2.12
//! [import]
-import QtGraphicalEffects 1.0
+import QtGraphicalEffects 1.12
//! [import]
Item {
diff --git a/src/effects/doc/snippets/BrightnessContrast-example.qml b/src/effects/doc/snippets/BrightnessContrast-example.qml
index 73bc369..c677fe3 100644
--- a/src/effects/doc/snippets/BrightnessContrast-example.qml
+++ b/src/effects/doc/snippets/BrightnessContrast-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/ColorOverlay-example.qml b/src/effects/doc/snippets/ColorOverlay-example.qml
index 7593286..6c7c91e 100644
--- a/src/effects/doc/snippets/ColorOverlay-example.qml
+++ b/src/effects/doc/snippets/ColorOverlay-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/Colorize-example.qml b/src/effects/doc/snippets/Colorize-example.qml
index f96237f..3b01bfc 100644
--- a/src/effects/doc/snippets/Colorize-example.qml
+++ b/src/effects/doc/snippets/Colorize-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/ConicalGradient-example.qml b/src/effects/doc/snippets/ConicalGradient-example.qml
index f89820a..6782fa8 100644
--- a/src/effects/doc/snippets/ConicalGradient-example.qml
+++ b/src/effects/doc/snippets/ConicalGradient-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/Desaturate-example.qml b/src/effects/doc/snippets/Desaturate-example.qml
index c445dce..c397627 100644
--- a/src/effects/doc/snippets/Desaturate-example.qml
+++ b/src/effects/doc/snippets/Desaturate-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/DirectionalBlur-example.qml b/src/effects/doc/snippets/DirectionalBlur-example.qml
index b21c5cd..90e0d29 100644
--- a/src/effects/doc/snippets/DirectionalBlur-example.qml
+++ b/src/effects/doc/snippets/DirectionalBlur-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/Displace-example.qml b/src/effects/doc/snippets/Displace-example.qml
index 1b5ba71..63493cb 100644
--- a/src/effects/doc/snippets/Displace-example.qml
+++ b/src/effects/doc/snippets/Displace-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/DropShadow-example.qml b/src/effects/doc/snippets/DropShadow-example.qml
index 6b7057a..23107eb 100644
--- a/src/effects/doc/snippets/DropShadow-example.qml
+++ b/src/effects/doc/snippets/DropShadow-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/DropShadow-transparentBorder-example.qml b/src/effects/doc/snippets/DropShadow-transparentBorder-example.qml
index 81dc94b..d3e102e 100644
--- a/src/effects/doc/snippets/DropShadow-transparentBorder-example.qml
+++ b/src/effects/doc/snippets/DropShadow-transparentBorder-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Rectangle {
width: 180
diff --git a/src/effects/doc/snippets/FastBlur-example.qml b/src/effects/doc/snippets/FastBlur-example.qml
index 0cd2bf3..5985051 100644
--- a/src/effects/doc/snippets/FastBlur-example.qml
+++ b/src/effects/doc/snippets/FastBlur-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/GammaAdjust-example.qml b/src/effects/doc/snippets/GammaAdjust-example.qml
index 5b9c7ca..8b5b750 100644
--- a/src/effects/doc/snippets/GammaAdjust-example.qml
+++ b/src/effects/doc/snippets/GammaAdjust-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/GaussianBlur-example.qml b/src/effects/doc/snippets/GaussianBlur-example.qml
index ec87f66..41962b7 100644
--- a/src/effects/doc/snippets/GaussianBlur-example.qml
+++ b/src/effects/doc/snippets/GaussianBlur-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/Glow-example.qml b/src/effects/doc/snippets/Glow-example.qml
index b3ed391..03b2813 100644
--- a/src/effects/doc/snippets/Glow-example.qml
+++ b/src/effects/doc/snippets/Glow-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/Glow-transparentBorder-example.qml b/src/effects/doc/snippets/Glow-transparentBorder-example.qml
index 656e4b3..d66dd15 100644
--- a/src/effects/doc/snippets/Glow-transparentBorder-example.qml
+++ b/src/effects/doc/snippets/Glow-transparentBorder-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Rectangle {
width: 180
diff --git a/src/effects/doc/snippets/HueSaturation-example.qml b/src/effects/doc/snippets/HueSaturation-example.qml
index 57c829f..08610c5 100644
--- a/src/effects/doc/snippets/HueSaturation-example.qml
+++ b/src/effects/doc/snippets/HueSaturation-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/InnerShadow-example.qml b/src/effects/doc/snippets/InnerShadow-example.qml
index be6e468..2238403 100644
--- a/src/effects/doc/snippets/InnerShadow-example.qml
+++ b/src/effects/doc/snippets/InnerShadow-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/LevelAdjust-example.qml b/src/effects/doc/snippets/LevelAdjust-example.qml
index 7ac9fb1..3326b73 100644
--- a/src/effects/doc/snippets/LevelAdjust-example.qml
+++ b/src/effects/doc/snippets/LevelAdjust-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/LinearGradient-example.qml b/src/effects/doc/snippets/LinearGradient-example.qml
index 25c72cb..7fc8a50 100644
--- a/src/effects/doc/snippets/LinearGradient-example.qml
+++ b/src/effects/doc/snippets/LinearGradient-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/MaskedBlur-example.qml b/src/effects/doc/snippets/MaskedBlur-example.qml
index 947428a..eb5939c 100644
--- a/src/effects/doc/snippets/MaskedBlur-example.qml
+++ b/src/effects/doc/snippets/MaskedBlur-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/OpacityMask-example.qml b/src/effects/doc/snippets/OpacityMask-example.qml
index 88f6688..fd8d145 100644
--- a/src/effects/doc/snippets/OpacityMask-example.qml
+++ b/src/effects/doc/snippets/OpacityMask-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/RadialBlur-example.qml b/src/effects/doc/snippets/RadialBlur-example.qml
index 84a6553..4e46f12 100644
--- a/src/effects/doc/snippets/RadialBlur-example.qml
+++ b/src/effects/doc/snippets/RadialBlur-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/RadialGradient-example.qml b/src/effects/doc/snippets/RadialGradient-example.qml
index 306fbe2..757783c 100644
--- a/src/effects/doc/snippets/RadialGradient-example.qml
+++ b/src/effects/doc/snippets/RadialGradient-example.qml
@@ -37,8 +37,8 @@
**
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/RectangularGlow-example.qml b/src/effects/doc/snippets/RectangularGlow-example.qml
index 12aeccd..3e4d1ff 100644
--- a/src/effects/doc/snippets/RectangularGlow-example.qml
+++ b/src/effects/doc/snippets/RectangularGlow-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/RecursiveBlur-example.qml b/src/effects/doc/snippets/RecursiveBlur-example.qml
index 93ac4d7..e045467 100644
--- a/src/effects/doc/snippets/RecursiveBlur-example.qml
+++ b/src/effects/doc/snippets/RecursiveBlur-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/ThresholdMask-example.qml b/src/effects/doc/snippets/ThresholdMask-example.qml
index fa4765a..23fecab 100644
--- a/src/effects/doc/snippets/ThresholdMask-example.qml
+++ b/src/effects/doc/snippets/ThresholdMask-example.qml
@@ -37,8 +37,8 @@
**
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/snippets/ZoomBlur-example.qml b/src/effects/doc/snippets/ZoomBlur-example.qml
index 81ae161..77d1c78 100644
--- a/src/effects/doc/snippets/ZoomBlur-example.qml
+++ b/src/effects/doc/snippets/ZoomBlur-example.qml
@@ -38,8 +38,8 @@
****************************************************************************/
//! [example]
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
Item {
width: 300
diff --git a/src/effects/doc/src/qtgraphicaleffects.qdoc b/src/effects/doc/src/qtgraphicaleffects.qdoc
index 8a42d60..104e46e 100644
--- a/src/effects/doc/src/qtgraphicaleffects.qdoc
+++ b/src/effects/doc/src/qtgraphicaleffects.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \qmlmodule QtGraphicalEffects 1.0
+ \qmlmodule QtGraphicalEffects 1.\QtMinorVersion
\title Qt Graphical Effect QML Types
\ingroup qmlmodules
@@ -39,10 +39,12 @@
user interface as UI components.
To use the types in this module, import the module with the following line:
- \qml
- import QtGraphicalEffects 1.0
+ \qml \QtMinorVersion
+ import QtGraphicalEffects 1.\1
\endqml
+ \note There are no API changes since version 1.0, so it's OK
+ to import version 1.0, or 1.\QtMinorVersion for convenience.
*/
/*!
diff --git a/src/effects/plugin.cpp b/src/effects/plugin.cpp
index d2baba2..cdd3a80 100644
--- a/src/effects/plugin.cpp
+++ b/src/effects/plugin.cpp
@@ -53,7 +53,11 @@ public:
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtGraphicalEffects"));
- Q_UNUSED(uri);
+
+ qmlRegisterModule(uri, 1, 0);
+
+ // 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);
}