diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-12-08 16:42:09 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2021-12-13 14:16:26 +0000 |
| commit | 51f22a3a0495d8418a5d6dd0f09771c0347441b9 (patch) | |
| tree | 34b5c133cd5e808e98c63b1e801400b716e34d9d /examples/dbus/remotecontrolledcar | |
| parent | 9ca7429dff4b5d46114ca36147f65b61d5e61290 (diff) | |
Examples: Remove remaining conversion markers in CMakeLists.txt
Pick-to: 6.3
Change-Id: Ia5d474a3efd6aadbd0ef1537318f2f24e6c24fee
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples/dbus/remotecontrolledcar')
| -rw-r--r-- | examples/dbus/remotecontrolledcar/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/dbus/remotecontrolledcar/car/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | examples/dbus/remotecontrolledcar/controller/CMakeLists.txt | 7 |
3 files changed, 4 insertions, 12 deletions
diff --git a/examples/dbus/remotecontrolledcar/CMakeLists.txt b/examples/dbus/remotecontrolledcar/CMakeLists.txt index 86f9f03ccc..259d3a0470 100644 --- a/examples/dbus/remotecontrolledcar/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/CMakeLists.txt @@ -1,4 +1,2 @@ -# Generated from remotecontrolledcar.pro. - qt_internal_add_example(car) qt_internal_add_example(controller) diff --git a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt index fa7a0a4b09..a40213697e 100644 --- a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from car.pro. - cmake_minimum_required(VERSION 3.16) project(car LANGUAGES CXX) @@ -17,7 +15,6 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/remotecontrolledcar/car") find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui Widgets) -# special case begin set(car_SRCS) qt_add_dbus_adaptor(car_SRCS car.xml @@ -25,11 +22,11 @@ qt_add_dbus_adaptor(car_SRCS "" # empty parent_class value on purpose to not pass -l flag car_adaptor ) -# special case end + qt_add_executable(car car.cpp car.h main.cpp - ${car_SRCS} # special case + ${car_SRCS} ) set_target_properties(car PROPERTIES WIN32_EXECUTABLE TRUE diff --git a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt index 09057f1cda..716fa7fe0d 100644 --- a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from controller.pro. - cmake_minimum_required(VERSION 3.16) project(controller LANGUAGES CXX) @@ -17,17 +15,16 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/remotecontrolledcar/controll find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui Widgets) -# special case begin set(controller_SRCS) qt_add_dbus_interface(controller_SRCS car.xml car_interface ) -# special case end + qt_add_executable(controller controller.cpp controller.h controller.ui main.cpp - ${controller_SRCS} # special case + ${controller_SRCS} ) set_target_properties(controller PROPERTIES WIN32_EXECUTABLE TRUE |