Regenerate projects

Change-Id: If53bcd94a338c62bf69ed7f74c6a8bc5ff4818ed
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>

6 files changed, 19 insertions, 23 deletions

diff --git a/src/effects/CMakeLists.txt b/src/effects/CMakeLists.txt
index ff6b72e..14c9213 100644
--- a/src/effects/CMakeLists.txt
+++ b/src/effects/CMakeLists.txt
@@ -98,7 +98,6 @@ add_qt_resource(qtgraphicaleffectsplugin "qtgraphicaleffectsshaders"
 # IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
 # QML_FILES = "Blend.qml" "BrightnessContrast.qml" "ColorOverlay.qml" "Colorize.qml" "ConicalGradient.qml" "Desaturate.qml" "DirectionalBlur.qml" "Displace.qml" "DropShadow.qml" "FastBlur.qml" "GammaAdjust.qml" "GaussianBlur.qml" "Glow.qml" "HueSaturation.qml" "InnerShadow.qml" "LevelAdjust.qml" "LinearGradient.qml" "MaskedBlur.qml" "OpacityMask.qml" "RadialBlur.qml" "RadialGradient.qml" "RectangularGlow.qml" "RecursiveBlur.qml" "ThresholdMask.qml" "ZoomBlur.qml"
 # TARGETPATH = "QtGraphicalEffects"
-# _LOADED = "qml_plugin"
 
 set(qml_files
     "Blend.qml"
diff --git a/src/effects/private/.prev_CMakeLists.txt b/src/effects/private/.prev_CMakeLists.txt
index 4037888..aba6f59 100644
--- a/src/effects/private/.prev_CMakeLists.txt
+++ b/src/effects/private/.prev_CMakeLists.txt
@@ -6,26 +6,27 @@
 
 qt_add_qml_module(qtgraphicaleffectsprivate
     URI "QtGraphicalEffects.private"
+    VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtGraphicalEffectsPrivatePlugin
     SOURCES
         plugin.cpp
         qgfxshaderbuilder.cpp qgfxshaderbuilder_p.h
         qgfxsourceproxy.cpp qgfxsourceproxy_p.h
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickPrivate
     PUBLIC_LIBRARIES
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Qml
+        Qt::QmlPrivate
         Qt::Quick
+        Qt::QuickPrivate
 )
 
 #### Keys ignored in scope 1:.:.:private.pro:<TRUE>:
 # CXX_MODULE = "qml"
 # QML_FILES = "DropShadowBase.qml" "FastGlow.qml" "FastInnerShadow.qml" "FastMaskedBlur.qml" "GaussianDirectionalBlur.qml" "GaussianGlow.qml" "GaussianInnerShadow.qml" "GaussianMaskedBlur.qml"
+# QML_IMPORT_VERSION = "$$QT_VERSION"
 # TARGETPATH = "QtGraphicalEffects/private"
 
 ## Scopes:
diff --git a/src/effects/private/CMakeLists.txt b/src/effects/private/CMakeLists.txt
index 815c308..aba6f59 100644
--- a/src/effects/private/CMakeLists.txt
+++ b/src/effects/private/CMakeLists.txt
@@ -6,27 +6,27 @@
 
 qt_add_qml_module(qtgraphicaleffectsprivate
     URI "QtGraphicalEffects.private"
+    VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtGraphicalEffectsPrivatePlugin
-    VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" # special case
     SOURCES
         plugin.cpp
         qgfxshaderbuilder.cpp qgfxshaderbuilder_p.h
         qgfxsourceproxy.cpp qgfxsourceproxy_p.h
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickPrivate
     PUBLIC_LIBRARIES
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Qml
+        Qt::QmlPrivate
         Qt::Quick
+        Qt::QuickPrivate
 )
 
 #### Keys ignored in scope 1:.:.:private.pro:<TRUE>:
 # CXX_MODULE = "qml"
 # QML_FILES = "DropShadowBase.qml" "FastGlow.qml" "FastInnerShadow.qml" "FastMaskedBlur.qml" "GaussianDirectionalBlur.qml" "GaussianGlow.qml" "GaussianInnerShadow.qml" "GaussianMaskedBlur.qml"
+# QML_IMPORT_VERSION = "$$QT_VERSION"
 # TARGETPATH = "QtGraphicalEffects/private"
 
 ## Scopes:
diff --git a/src/effects/private/private.pro b/src/effects/private/private.pro
index 64d63c9..ef63d6b 100644
--- a/src/effects/private/private.pro
+++ b/src/effects/private/private.pro
@@ -1,6 +1,7 @@
 CXX_MODULE=qml
 TARGETPATH=QtGraphicalEffects/private
 TARGET = qtgraphicaleffectsprivate
+QML_IMPORT_VERSION = $$QT_VERSION
 
 QT += quick qml
 # Needed to get a hold of QQuickShaderEffectSource, QQuickImage and QQuickItemPrivate
diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt
index 1ff062b..2214137 100644
--- a/tests/.prev_CMakeLists.txt
+++ b/tests/.prev_CMakeLists.txt
@@ -1,10 +1,7 @@
 # Generated from tests.pro.
 
-if(NOT TARGET Qt::Test)
-    cmake_minimum_required(VERSION 3.15.0)
-    project(graphicaleffectsTests_FIXME VERSION 6.0.0 LANGUAGES C CXX)
-    find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
-    find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
-    qt_set_up_standalone_tests_build()
+if(QT_BUILD_STANDALONE_TESTS)
+    # Add qt_find_package calls for extra dependencies that need to be found when building
+    # the standalone tests here.
 endif()
 qt_build_tests()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e65ab4b..ed965c0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,10 +1,8 @@
 # Generated from tests.pro.
 
-if(NOT TARGET Qt::Test)
-    cmake_minimum_required(VERSION 3.15.0)
-    project(QtGraphicalEffectsTests VERSION 6.0.0 LANGUAGES C CXX) # special case
-    find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core Test Qml Quick) # special case
-    qt_set_up_standalone_tests_build()
+if(QT_BUILD_STANDALONE_TESTS)
+    # Add qt_find_package calls for extra dependencies that need to be found when building
+    # the standalone tests here.
 endif()
 qt_build_tests()