diff options
Diffstat (limited to 'src/effects')
35 files changed, 74 insertions, 69 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..619b38a 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 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); } }; |