diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-14 12:59:07 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-14 16:31:09 +0200 |
commit | fe3bd212fc85b6c3a64bb8bd5beca4ff4d3493a1 (patch) | |
tree | b96dd84abfb6ac25b26539999bf2d7d427f347dd /examples/dbus | |
parent | 72066a3a585b4f4fed499c64464ca5ad2ba9f71d (diff) | |
parent | ae97d11589dd03edeea0475163e6110869143b35 (diff) |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
This changes many different CMake places to mention Qt6 instead of
Qt5.
Note that some old qt5 cmake config files in corelib are probably not
needed anymore, but I still renamed and kept them for now.
Change-Id: Ie69e81540386a5af153f76c0242e18d48211bec4
Diffstat (limited to 'examples/dbus')
-rw-r--r-- | examples/dbus/chat/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/dbus/complexpingpong/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/dbus/listnames/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/dbus/pingpong/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/dbus/remotecontrolledcar/car/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/dbus/remotecontrolledcar/controller/CMakeLists.txt | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/examples/dbus/chat/CMakeLists.txt b/examples/dbus/chat/CMakeLists.txt index 54becdb2d3..59036e2cbd 100644 --- a/examples/dbus/chat/CMakeLists.txt +++ b/examples/dbus/chat/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS DBus) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS DBus) +find_package(Qt6 COMPONENTS Widgets) # special case begin set(chat_SRCS) diff --git a/examples/dbus/complexpingpong/CMakeLists.txt b/examples/dbus/complexpingpong/CMakeLists.txt index d9b882657e..01a824e5e7 100644 --- a/examples/dbus/complexpingpong/CMakeLists.txt +++ b/examples/dbus/complexpingpong/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS DBus) +find_package(Qt6 COMPONENTS DBus) add_qt_gui_executable(complexpong complexpong.cpp complexpong.h diff --git a/examples/dbus/listnames/CMakeLists.txt b/examples/dbus/listnames/CMakeLists.txt index 334d841cdf..60c91ba8b4 100644 --- a/examples/dbus/listnames/CMakeLists.txt +++ b/examples/dbus/listnames/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS DBus) +find_package(Qt6 COMPONENTS DBus) add_qt_gui_executable(listnames listnames.cpp diff --git a/examples/dbus/pingpong/CMakeLists.txt b/examples/dbus/pingpong/CMakeLists.txt index 4cae8ecfdf..6a2a84e974 100644 --- a/examples/dbus/pingpong/CMakeLists.txt +++ b/examples/dbus/pingpong/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS DBus) +find_package(Qt6 COMPONENTS DBus) add_qt_gui_executable(pong ping-common.h diff --git a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt index 18af20fe38..1265f7cebd 100644 --- a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS DBus) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS DBus) +find_package(Qt6 COMPONENTS Widgets) # special case begin set(car_SRCS) diff --git a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt index 06a975db7e..1b01e82cf2 100644 --- a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS DBus) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS DBus) +find_package(Qt6 COMPONENTS Widgets) # special case begin set(controller_SRCS) |