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/embedded | |
| 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/embedded')
| -rw-r--r-- | examples/embedded/digiflip/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/embedded/flickable/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/embedded/flightinfo/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/embedded/lightmaps/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/embedded/raycasting/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/embedded/styleexample/CMakeLists.txt | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/examples/embedded/digiflip/CMakeLists.txt b/examples/embedded/digiflip/CMakeLists.txt index 340dc34859..f5557766ad 100644 --- a/examples/embedded/digiflip/CMakeLists.txt +++ b/examples/embedded/digiflip/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(digiflip digiflip.cpp diff --git a/examples/embedded/flickable/CMakeLists.txt b/examples/embedded/flickable/CMakeLists.txt index cc2611cc1b..bd435d1352 100644 --- a/examples/embedded/flickable/CMakeLists.txt +++ b/examples/embedded/flickable/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(flickable flickable.cpp flickable.h diff --git a/examples/embedded/flightinfo/CMakeLists.txt b/examples/embedded/flightinfo/CMakeLists.txt index 4415ab91b5..b2d7695c37 100644 --- a/examples/embedded/flightinfo/CMakeLists.txt +++ b/examples/embedded/flightinfo/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(flightinfo flightinfo.cpp diff --git a/examples/embedded/lightmaps/CMakeLists.txt b/examples/embedded/lightmaps/CMakeLists.txt index 3a3ab6fd43..775c12be66 100644 --- a/examples/embedded/lightmaps/CMakeLists.txt +++ b/examples/embedded/lightmaps/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(lightmaps lightmaps.cpp lightmaps.h diff --git a/examples/embedded/raycasting/CMakeLists.txt b/examples/embedded/raycasting/CMakeLists.txt index 64844bca56..0b48de26a5 100644 --- a/examples/embedded/raycasting/CMakeLists.txt +++ b/examples/embedded/raycasting/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(raycasting raycasting.cpp raycasting.qrc diff --git a/examples/embedded/styleexample/CMakeLists.txt b/examples/embedded/styleexample/CMakeLists.txt index 44b9a8ae1e..a0ec3d738a 100644 --- a/examples/embedded/styleexample/CMakeLists.txt +++ b/examples/embedded/styleexample/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(styleexample main.cpp |