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/qtestlib | |
| 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/qtestlib')
| -rw-r--r-- | examples/qtestlib/tutorial1/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/qtestlib/tutorial2/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/qtestlib/tutorial3/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/qtestlib/tutorial4/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/qtestlib/tutorial5/CMakeLists.txt | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/examples/qtestlib/tutorial1/CMakeLists.txt b/examples/qtestlib/tutorial1/CMakeLists.txt index b1bc520339..fabe54bf1a 100644 --- a/examples/qtestlib/tutorial1/CMakeLists.txt +++ b/examples/qtestlib/tutorial1/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Widgets) -find_package(Qt5 COMPONENTS Test) +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Test) add_qt_gui_executable(tutorial1 testqstring.cpp diff --git a/examples/qtestlib/tutorial2/CMakeLists.txt b/examples/qtestlib/tutorial2/CMakeLists.txt index 1c89575d14..52ad642cca 100644 --- a/examples/qtestlib/tutorial2/CMakeLists.txt +++ b/examples/qtestlib/tutorial2/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Widgets) -find_package(Qt5 COMPONENTS Test) +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Test) add_qt_gui_executable(tutorial2 testqstring.cpp diff --git a/examples/qtestlib/tutorial3/CMakeLists.txt b/examples/qtestlib/tutorial3/CMakeLists.txt index f6ef8776f5..8dfba0bbe1 100644 --- a/examples/qtestlib/tutorial3/CMakeLists.txt +++ b/examples/qtestlib/tutorial3/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Widgets) -find_package(Qt5 COMPONENTS Test) +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Test) add_qt_gui_executable(tutorial3 testgui.cpp diff --git a/examples/qtestlib/tutorial4/CMakeLists.txt b/examples/qtestlib/tutorial4/CMakeLists.txt index 11d62ad582..e5af801801 100644 --- a/examples/qtestlib/tutorial4/CMakeLists.txt +++ b/examples/qtestlib/tutorial4/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Widgets) -find_package(Qt5 COMPONENTS Test) +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Test) add_qt_gui_executable(tutorial4 testgui.cpp diff --git a/examples/qtestlib/tutorial5/CMakeLists.txt b/examples/qtestlib/tutorial5/CMakeLists.txt index 799cff62c6..3b6f4db4d0 100644 --- a/examples/qtestlib/tutorial5/CMakeLists.txt +++ b/examples/qtestlib/tutorial5/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Widgets) -find_package(Qt5 COMPONENTS Test) +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Test) add_qt_gui_executable(tutorial5 benchmarking.cpp |