Rendercontrol example: use new cmake api

Updating the CMakeLists.txt files in the d3d11 and opengl version of
the example to use the new qt_add_qml_module() function instead of the
old qt_add_resources()

Task-number: QTBUG-98130
Change-Id: Ida43e4b0c875951a85d754b3a96f88366b580e24
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 88dfbe0deaa780f1cb5793d644341367d02e3073)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

4 files changed, 28 insertions, 58 deletions

diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt
index 98da6e317d..1851fba31d 100644
--- a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt
+++ b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt
@@ -6,8 +6,6 @@ project(rendercontrol_d3d11 LANGUAGES CXX)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
   set(INSTALL_EXAMPLESDIR "examples")
@@ -15,21 +13,14 @@ endif()
 
 set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/rendercontrol/rendercontrol_d3d11")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS Qml)
+find_package(Qt6 COMPONENTS Core Gui Quick Qml)
 
-qt_add_executable(rendercontrol_d3d11
-    engine.cpp engine.h
+qt_add_executable(rendercontrol_d3d11example WIN32 MACOSX_BUNDLE
+    engine.cpp
     main.cpp
-    window.cpp window.h
+    window.cpp
 )
-set_target_properties(rendercontrol_d3d11 PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
-)
-target_link_libraries(rendercontrol_d3d11 PUBLIC
+target_link_libraries(rendercontrol_d3d11example PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Qml
@@ -42,18 +33,14 @@ target_link_libraries(rendercontrol_d3d11 PUBLIC
 
 
 # Resources:
-set(rendercontrol_resource_files
-    "demo.qml"
-)
-
-qt6_add_resources(rendercontrol_d3d11 "rendercontrol"
-    PREFIX
-        "/rendercontrol"
-    FILES
-        ${rendercontrol_resource_files}
+qt_add_qml_module(rendercontrol_d3d11example
+    URI rendercontrol
+    VERSION 1.0
+    QML_FILES
+        "demo.qml"
 )
 
-install(TARGETS rendercontrol_d3d11
+install(TARGETS rendercontrol_d3d11example
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/demo.qml b/examples/quick/rendercontrol/rendercontrol_d3d11/demo.qml
index 32e2f423d1..d724d6304b 100644
--- a/examples/quick/rendercontrol/rendercontrol_d3d11/demo.qml
+++ b/examples/quick/rendercontrol/rendercontrol_d3d11/demo.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 
 Rectangle {
     id: root
diff --git a/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt
index 2ac8eaf1eb..e15de24f08 100644
--- a/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt
+++ b/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt
@@ -1,13 +1,9 @@
-# Generated from rendercontrol_opengl.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(rendercontrol_opengl LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
   set(INSTALL_EXAMPLESDIR "examples")
@@ -15,22 +11,14 @@ endif()
 
 set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/rendercontrol/rendercontrol_opengl")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS Qml)
-find_package(Qt6 COMPONENTS OpenGL)
+find_package(Qt6 COMPONENTS Core Gui Quick Qml OpenGL)
 
-qt_add_executable(rendercontrol_opengl
-    cuberenderer.cpp cuberenderer.h
+qt_add_executable(rendercontrol_openglexample WIN32 MACOSX_BUNDLE
+    cuberenderer.cpp
     main.cpp
-    window_singlethreaded.cpp window_singlethreaded.h
-)
-set_target_properties(rendercontrol_opengl PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
+    window_singlethreaded.cpp
 )
-target_link_libraries(rendercontrol_opengl PUBLIC
+target_link_libraries(rendercontrol_openglexample PUBLIC
     Qt::Core
     Qt::Gui
     Qt::OpenGL
@@ -38,20 +26,15 @@ target_link_libraries(rendercontrol_opengl PUBLIC
     Qt::Quick
 )
 
-
 # Resources:
-set(rendercontrol_resource_files
-    "demo.qml"
-)
-
-qt6_add_resources(rendercontrol_opengl "rendercontrol"
-    PREFIX
-        "/rendercontrol"
-    FILES
-        ${rendercontrol_resource_files}
+qt_add_qml_module(rendercontrol_openglexample
+    URI rendercontrol
+    VERSION 1.0
+    QML_FILES
+        "demo.qml"
 )
 
-install(TARGETS rendercontrol_opengl
+install(TARGETS rendercontrol_openglexample
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/rendercontrol/rendercontrol_opengl/demo.qml b/examples/quick/rendercontrol/rendercontrol_opengl/demo.qml
index 0312c2ec1c..6fad1c5ef5 100644
--- a/examples/quick/rendercontrol/rendercontrol_opengl/demo.qml
+++ b/examples/quick/rendercontrol/rendercontrol_opengl/demo.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 
 Rectangle {
     id: root