CMake: Regenerate projects using pro2cmake one last time

And fix up some incorrect qmake project files

Pick-to: 6.0
Change-Id: Ia6d27ac68195635021fe7c4a5f06386a60f3f323
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

5 files changed, 48 insertions, 20 deletions

diff --git a/src/imports/tooling/CMakeLists.txt b/src/imports/tooling/CMakeLists.txt
index a6273a1ee5..c36c8c1474 100644
--- a/src/imports/tooling/CMakeLists.txt
+++ b/src/imports/tooling/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Generated from tooling.pro.
+# special case skip regeneration
 
-# special case begin
 set(qml_files
     "Component.qml"
     "Enum.qml"
@@ -29,5 +29,3 @@ qt6_target_qml_files(quicktooling
         ${qml_files}
 )
 
-# special case end
-
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
index 2fb7617f87..538e1e5bae 100644
--- a/src/particles/CMakeLists.txt
+++ b/src/particles/CMakeLists.txt
@@ -64,14 +64,14 @@ qt_internal_add_resource(QuickParticles "particles"
         ${particles_resource_files}
 )
 set(particles1_resource_files
-    "shaders_ng/imageparticle_simplepoint.frag.qsb"
-    "shaders_ng/imageparticle_simplepoint.vert.qsb"
-    "shaders_ng/imageparticle_coloredpoint.frag.qsb"
-    "shaders_ng/imageparticle_coloredpoint.vert.qsb"
     "shaders_ng/imageparticle_colored.frag.qsb"
     "shaders_ng/imageparticle_colored.vert.qsb"
+    "shaders_ng/imageparticle_coloredpoint.frag.qsb"
+    "shaders_ng/imageparticle_coloredpoint.vert.qsb"
     "shaders_ng/imageparticle_deformed.frag.qsb"
     "shaders_ng/imageparticle_deformed.vert.qsb"
+    "shaders_ng/imageparticle_simplepoint.frag.qsb"
+    "shaders_ng/imageparticle_simplepoint.vert.qsb"
     "shaders_ng/imageparticle_sprite.frag.qsb"
     "shaders_ng/imageparticle_sprite.vert.qsb"
     "shaders_ng/imageparticle_tabled.frag.qsb"
diff --git a/src/qmldom/.prev_CMakeLists.txt b/src/qmldom/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..39a82e3ec0
--- /dev/null
+++ b/src/qmldom/.prev_CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from qmldom.pro.
+
+#####################################################################
+## QmlDom Module:
+#####################################################################
+
+qt_internal_add_module(QmlDom
+    STATIC
+    INTERNAL_MODULE
+    NO_SYNC_QT
+    SOURCES
+        qqmldom_fwd_p.h
+        qqmldom_global.h
+        qqmldomconstants_p.h
+        qqmldomerrormessage.cpp qqmldomerrormessage_p.h
+        qqmldomexternalitems.cpp qqmldomexternalitems_p.h
+        qqmldomitem.cpp qqmldomitem_p.h
+        qqmldompath.cpp qqmldompath_p.h
+        qqmldomstringdumper.cpp qqmldomstringdumper_p.h
+        qqmldomtop.cpp qqmldomtop_p.h
+    DEFINES
+        QMLDOM_LIBRARY
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::QmlDevToolsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qmldom.pro:<TRUE>:
+# _OPTION = "host_build"
diff --git a/src/qmldom/CMakeLists.txt b/src/qmldom/CMakeLists.txt
index df3da266f8..491df40ef5 100644
--- a/src/qmldom/CMakeLists.txt
+++ b/src/qmldom/CMakeLists.txt
@@ -1,28 +1,29 @@
 # Generated from qmldom.pro.
 
 #####################################################################
-## QmlCompiler Module:
+## QmlDom Module:
 #####################################################################
 
 qt_internal_add_module(QmlDom
     STATIC
     INTERNAL_MODULE
+    # NO_SYNC_QT # special case remove, it's actually needed for tests
     SOURCES
-       qqmldom_global.h
-       qqmldom_fwd_p.h
-       qqmldomconstants_p.h
-       qqmldomerrormessage.cpp qqmldomerrormessage_p.h
-       qqmldomexternalitems.cpp qqmldomexternalitems_p.h
-       qqmldomitem.cpp qqmldomitem_p.h
-       qqmldompath.cpp qqmldompath_p.h
-       qqmldomstringdumper.cpp qqmldomstringdumper_p.h
-       qqmldomtop.cpp qqmldomtop_p.h
+        qqmldom_fwd_p.h
+        qqmldom_global.h
+        qqmldomconstants_p.h
+        qqmldomerrormessage.cpp qqmldomerrormessage_p.h
+        qqmldomexternalitems.cpp qqmldomexternalitems_p.h
+        qqmldomitem.cpp qqmldomitem_p.h
+        qqmldompath.cpp qqmldompath_p.h
+        qqmldomstringdumper.cpp qqmldomstringdumper_p.h
+        qqmldomtop.cpp qqmldomtop_p.h
     DEFINES
-       QMLDOM_LIBRARY
+        QMLDOM_LIBRARY
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::QmlDevToolsPrivate
 )
 
-#### Keys ignored in scope 1:.:.:qmlcompiler.pro:<TRUE>:
+#### Keys ignored in scope 1:.:.:qmldom.pro:<TRUE>:
 # _OPTION = "host_build"
diff --git a/src/quick/configure.cmake b/src/quick/configure.cmake
index 65fe462b51..b63830671e 100644
--- a/src/quick/configure.cmake
+++ b/src/quick/configure.cmake
@@ -66,7 +66,7 @@ qt_feature("quick-particles" PRIVATE
     SECTION "Qt Quick"
     LABEL "Particle support"
     PURPOSE "Provides a particle system."
-    CONDITION TARGET Qt::Gui AND QT_FEATURE_quick_shadereffect AND QT_FEATURE_quick_sprite AND QT_FEATURE_opengl
+    CONDITION TARGET Qt::Gui AND QT_FEATURE_quick_shadereffect AND QT_FEATURE_quick_sprite
 )
 qt_feature("quick-path" PRIVATE
     SECTION "Qt Quick"