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/widgets/dialogs | |
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/widgets/dialogs')
7 files changed, 8 insertions, 8 deletions
diff --git a/examples/widgets/dialogs/classwizard/CMakeLists.txt b/examples/widgets/dialogs/classwizard/CMakeLists.txt index 1f763111d5..51c4c9e351 100644 --- a/examples/widgets/dialogs/classwizard/CMakeLists.txt +++ b/examples/widgets/dialogs/classwizard/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(classwizard classwizard.cpp classwizard.h classwizard.qrc diff --git a/examples/widgets/dialogs/extension/CMakeLists.txt b/examples/widgets/dialogs/extension/CMakeLists.txt index f21fddf722..108858868c 100644 --- a/examples/widgets/dialogs/extension/CMakeLists.txt +++ b/examples/widgets/dialogs/extension/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(extension finddialog.cpp finddialog.h diff --git a/examples/widgets/dialogs/findfiles/CMakeLists.txt b/examples/widgets/dialogs/findfiles/CMakeLists.txt index 9865d67076..27e2265e70 100644 --- a/examples/widgets/dialogs/findfiles/CMakeLists.txt +++ b/examples/widgets/dialogs/findfiles/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(findfiles main.cpp diff --git a/examples/widgets/dialogs/licensewizard/CMakeLists.txt b/examples/widgets/dialogs/licensewizard/CMakeLists.txt index b09c1a4802..9684cd8171 100644 --- a/examples/widgets/dialogs/licensewizard/CMakeLists.txt +++ b/examples/widgets/dialogs/licensewizard/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Widgets) -find_package(Qt5 COMPONENTS PrintSupport) +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS PrintSupport) add_qt_gui_executable(licensewizard licensewizard.cpp licensewizard.h licensewizard.qrc diff --git a/examples/widgets/dialogs/standarddialogs/CMakeLists.txt b/examples/widgets/dialogs/standarddialogs/CMakeLists.txt index 0cce717924..2e1a84a4f0 100644 --- a/examples/widgets/dialogs/standarddialogs/CMakeLists.txt +++ b/examples/widgets/dialogs/standarddialogs/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(standarddialogs dialog.cpp dialog.h diff --git a/examples/widgets/dialogs/tabdialog/CMakeLists.txt b/examples/widgets/dialogs/tabdialog/CMakeLists.txt index 50d6209cb8..980f3cb222 100644 --- a/examples/widgets/dialogs/tabdialog/CMakeLists.txt +++ b/examples/widgets/dialogs/tabdialog/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(tabdialog main.cpp diff --git a/examples/widgets/dialogs/trivialwizard/CMakeLists.txt b/examples/widgets/dialogs/trivialwizard/CMakeLists.txt index a8601f02ec..1c194017a4 100644 --- a/examples/widgets/dialogs/trivialwizard/CMakeLists.txt +++ b/examples/widgets/dialogs/trivialwizard/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(trivialwizard trivialwizard.cpp |