From 51f22a3a0495d8418a5d6dd0f09771c0347441b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 8 Dec 2021 16:42:09 +0100 Subject: Examples: Remove remaining conversion markers in CMakeLists.txt Pick-to: 6.3 Change-Id: Ia5d474a3efd6aadbd0ef1537318f2f24e6c24fee Reviewed-by: Alexandru Croitor --- examples/dbus/CMakeLists.txt | 2 -- examples/dbus/chat/CMakeLists.txt | 7 ++----- examples/dbus/listnames/CMakeLists.txt | 2 -- examples/dbus/remotecontrolledcar/CMakeLists.txt | 2 -- examples/dbus/remotecontrolledcar/car/CMakeLists.txt | 7 ++----- examples/dbus/remotecontrolledcar/controller/CMakeLists.txt | 7 ++----- 6 files changed, 6 insertions(+), 21 deletions(-) (limited to 'examples/dbus') diff --git a/examples/dbus/CMakeLists.txt b/examples/dbus/CMakeLists.txt index ac941a3218..d61f1db460 100644 --- a/examples/dbus/CMakeLists.txt +++ b/examples/dbus/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from dbus.pro. - if(NOT TARGET Qt::DBus) return() endif() diff --git a/examples/dbus/chat/CMakeLists.txt b/examples/dbus/chat/CMakeLists.txt index e5ef5956f6..8d5354212f 100644 --- a/examples/dbus/chat/CMakeLists.txt +++ b/examples/dbus/chat/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from chat.pro. - cmake_minimum_required(VERSION 3.16) project(chat LANGUAGES CXX) @@ -17,7 +15,6 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/chat") find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui Widgets) -# special case begin set(chat_SRCS) qt_add_dbus_interface(chat_SRCS org.example.chat.xml @@ -29,12 +26,12 @@ qt_add_dbus_adaptor(chat_SRCS QObject chat_adaptor ) -# special case end + qt_add_executable(chat chat.cpp chat.h chatmainwindow.ui chatsetnickname.ui - ${chat_SRCS} # special case + ${chat_SRCS} ) set_target_properties(chat PROPERTIES WIN32_EXECUTABLE TRUE diff --git a/examples/dbus/listnames/CMakeLists.txt b/examples/dbus/listnames/CMakeLists.txt index 13ec3b5572..589c9ca269 100644 --- a/examples/dbus/listnames/CMakeLists.txt +++ b/examples/dbus/listnames/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from listnames.pro. - cmake_minimum_required(VERSION 3.16) project(listnames LANGUAGES CXX) 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 -- cgit v1.2.3