1 files changed, 36 insertions, 33 deletions
diff --git a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
index 33df2b5ebd..a0c1aea7c5 100644
--- a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
+++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
@@ -1,50 +1,53 @@
-# Generated from controller.pro.
-
-cmake_minimum_required(VERSION 3.16)
-project(controller LANGUAGES CXX)
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 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")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/remotecontrolledcar/controller")
-
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS DBus)
-find_package(Qt6 COMPONENTS Widgets)
-
-# special case begin
 set(controller_SRCS)
-qt6_add_dbus_interface(controller_SRCS
-    car.xml
+qt_add_dbus_interface(controller_SRCS
+    ../common/car.xml
     car_interface
 )
-# special case end
+
 qt_add_executable(controller
-    controller.cpp controller.h controller.ui
+    controller.cpp controller.h
     main.cpp
-    ${controller_SRCS} # special case
+    ${controller_SRCS}
 )
+
+qt_add_resources(controller
+    PREFIX
+        "/"
+    FILES
+    down.svg
+    left.svg
+    right.svg
+    up.svg
+    connected.svg
+    connecting.svg
+)
+
 set_target_properties(controller PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_link_libraries(controller PUBLIC
-    Qt::Core
-    Qt::DBus
-    Qt::Gui
-    Qt::Widgets
+
+target_link_libraries(controller PRIVATE
+    Qt6::Core
+    Qt6::DBus
+    Qt6::Gui
+    Qt6::Widgets
 )
 
 install(TARGETS controller
-    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE  DESTINATION .
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+
+qt_generate_deploy_app_script(
+    TARGET controller
+    OUTPUT_SCRIPT deploy_script
+    NO_UNSUPPORTED_PLATFORM_ERROR
 )
+install(SCRIPT ${deploy_script})