diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-23 11:39:30 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-23 10:04:30 +0000 |
| commit | bf298499a058394cff1041580c29d30fc78568ef (patch) | |
| tree | f1aa5806628c734b3fe09e85ca2cf74ba797d555 /examples | |
| parent | acdc5dfaee8502f12486204fd2f01ba7eb0bbbfd (diff) | |
Update public CMake macros' version
Update all public Qt macros to use qt6/QT6 instead of qt5/QT6.
Change-Id: Ib178f4fa21f37dfb8da7d4d8c097aa0e96c9d9f9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples')
4 files changed, 6 insertions, 6 deletions
diff --git a/examples/dbus/chat/CMakeLists.txt b/examples/dbus/chat/CMakeLists.txt index 59036e2cbd..064ce26833 100644 --- a/examples/dbus/chat/CMakeLists.txt +++ b/examples/dbus/chat/CMakeLists.txt @@ -16,11 +16,11 @@ find_package(Qt6 COMPONENTS Widgets) # special case begin set(chat_SRCS) -qt5_add_dbus_interface(chat_SRCS +qt6_add_dbus_interface(chat_SRCS org.example.chat.xml chat_interface ) -qt5_add_dbus_adaptor(chat_SRCS +qt6_add_dbus_adaptor(chat_SRCS org.example.chat.xml qobject.h QObject diff --git a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt index 1265f7cebd..10abdd8f70 100644 --- a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt @@ -16,7 +16,7 @@ find_package(Qt6 COMPONENTS Widgets) # special case begin set(car_SRCS) -qt5_add_dbus_adaptor(car_SRCS +qt6_add_dbus_adaptor(car_SRCS car.xml car.h Car diff --git a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt index 1b01e82cf2..2075261d18 100644 --- a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt @@ -16,7 +16,7 @@ find_package(Qt6 COMPONENTS Widgets) # special case begin set(controller_SRCS) -qt5_add_dbus_interface(controller_SRCS +qt6_add_dbus_interface(controller_SRCS car.xml car_interface ) diff --git a/examples/widgets/painting/shared/CMakeLists.txt b/examples/widgets/painting/shared/CMakeLists.txt index c94a586425..4b873962a6 100644 --- a/examples/widgets/painting/shared/CMakeLists.txt +++ b/examples/widgets/painting/shared/CMakeLists.txt @@ -2,7 +2,7 @@ # special case: add_library(painting_shared OBJECT) -qt5_wrap_cpp(moc_files arthurwidgets.h hoverpoints.h) # no automoc for OBJECT libs:-/ +qt6_wrap_cpp(moc_files arthurwidgets.h hoverpoints.h) # no automoc for OBJECT libs:-/ target_sources(painting_shared PRIVATE arthurstyle.cpp arthurstyle.h arthurwidgets.cpp arthurwidgets.h @@ -12,7 +12,7 @@ target_sources(painting_shared PRIVATE target_link_libraries(painting_shared PUBLIC Qt::Widgets) target_include_directories(painting_shared PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") -qt5_add_resources(res_files shared.qrc) +qt6_add_resources(res_files shared.qrc) target_sources(painting_shared PRIVATE ${res_files}) ## Scopes: |