CMake: Regenerate projects using pro2cmake one last time

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

3 files changed, 29 insertions, 32 deletions

diff --git a/examples/demos/photoviewer/CMakeLists.txt b/examples/demos/photoviewer/CMakeLists.txt
index 15cdb5d0d..b0a8bb1f8 100644
--- a/examples/demos/photoviewer/CMakeLists.txt
+++ b/examples/demos/photoviewer/CMakeLists.txt
@@ -19,35 +19,26 @@ find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Qml)
 find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS QuickControls2 REQUIRED)
-find_package(Qt6 COMPONENTS Network)
 
 qt_add_executable(photoviewer
+    ../shared/xmllistmodel.cpp ../shared/xmllistmodel.h
     main.cpp
-    ../shared/xmllistmodel.cpp
-    ../shared/xmllistmodel.h
 )
-
 set_target_properties(photoviewer PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
-    QT_QML_MODULE_VERSION 1.0
-    QT_QML_MODULE_URI XmlListModel
 )
-qt6_qml_type_registration(photoviewer)
+target_include_directories(photoviewer PUBLIC
+    ../shared
+)
 
 target_link_libraries(photoviewer PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Qml
     Qt::Quick
-    Qt::Network
-    Qt::QuickControls2
 )
 
-target_include_directories(photoviewer PUBLIC
-    ../shared
-)
 
 # Resources:
 set(qmake_immediate_resource_files
@@ -86,3 +77,10 @@ install(TARGETS photoviewer
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
+
+set_target_properties(photoviewer PROPERTIES
+    QT_QML_MODULE_VERSION 1.0
+    QT_QML_MODULE_URI XmlListModel
+)
+
+qt6_qml_type_registration(photoviewer)
diff --git a/examples/demos/rssnews/CMakeLists.txt b/examples/demos/rssnews/CMakeLists.txt
index fe4651693..ed8255c1d 100644
--- a/examples/demos/rssnews/CMakeLists.txt
+++ b/examples/demos/rssnews/CMakeLists.txt
@@ -20,12 +20,17 @@ find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Quick)
 find_package(Qt6 COMPONENTS Qml)
 find_package(Qt6 COMPONENTS Xml)
-find_package(Qt6 COMPONENTS Network)
 
 qt_add_executable(rssnews
+    ../shared/xmllistmodel.cpp ../shared/xmllistmodel.h
     main.cpp
-    ../shared/xmllistmodel.cpp
-    ../shared/xmllistmodel.h
+)
+set_target_properties(rssnews PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_include_directories(rssnews PUBLIC
+    ../shared
 )
 
 target_link_libraries(rssnews PUBLIC
@@ -34,20 +39,7 @@ target_link_libraries(rssnews PUBLIC
     Qt::Qml
     Qt::Quick
     Qt::Xml
-    Qt::Network
-)
-
-target_include_directories(rssnews PUBLIC
-    ../shared
-)
-
-set_target_properties(rssnews PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
-    QT_QML_MODULE_VERSION 1.0
-    QT_QML_MODULE_URI XmlListModel
 )
-qt6_qml_type_registration(rssnews)
 
 
 # Resources:
@@ -87,3 +79,10 @@ install(TARGETS rssnews
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
+
+set_target_properties(rssnews PROPERTIES
+    QT_QML_MODULE_VERSION 1.0
+    QT_QML_MODULE_URI XmlListModel
+)
+
+qt6_qml_type_registration(rssnews)
diff --git a/examples/demos/tweetsearch/CMakeLists.txt b/examples/demos/tweetsearch/CMakeLists.txt
index 2e648e31d..6826bc6d2 100644
--- a/examples/demos/tweetsearch/CMakeLists.txt
+++ b/examples/demos/tweetsearch/CMakeLists.txt
@@ -50,15 +50,15 @@ set(qmake_content_resource_files
     "content/resources/icon-loading.png"
     "content/resources/icon-refresh.png"
     "content/resources/icon-search.png"
-    "content/tweetsearch.mjs"
-    "tweetsearch.qml"
     "content/shaders/effect.frag"
     "content/shaders/effect.frag.qsb"
     "content/shaders/effect.vert"
     "content/shaders/effect.vert.qsb"
+    "content/tweetsearch.mjs"
+    "tweetsearch.qml"
 )
 
-qt6_add_resources(tweetsearch "qml_and_shader_content"
+qt6_add_resources(tweetsearch "qmake_content"
     PREFIX
         "/demos/tweetsearch"
     FILES