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/tutorials | |
| 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/tutorials')
24 files changed, 25 insertions, 25 deletions
diff --git a/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt index 07ff78f7d3..74e9d98418 100644 --- a/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part1/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(part1 addressbook.cpp addressbook.h diff --git a/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt index 28a3a6a472..dd7c53170e 100644 --- a/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part2/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(part2 addressbook.cpp addressbook.h diff --git a/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt index d8d1147306..f1923a9947 100644 --- a/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part3/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(part3 addressbook.cpp addressbook.h diff --git a/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt index 9818a51181..fd6ec7d4e7 100644 --- a/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part4/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(part4 addressbook.cpp addressbook.h diff --git a/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt index 6ddf50aac7..84f7bd607a 100644 --- a/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part5/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(part5 addressbook.cpp addressbook.h diff --git a/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt index 75b7592484..172a8157a8 100644 --- a/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part6/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(part6 addressbook.cpp addressbook.h diff --git a/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt index 5dcb53e470..f420ebeff7 100644 --- a/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part7/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(part7 addressbook.cpp addressbook.h diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt index 739d1384d9..c47d130e3b 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part1/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(part1 main.cpp diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt index db6bfc8bea..024fc717d4 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part2/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(part2 main.cpp diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt index f1cc350d1e..886598c11f 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part3/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(part3 main.cpp diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt index bfd358f381..e4a532ca37 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part4/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(part4 main.cpp diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt index 006b1a6ea5..1b118f50e9 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part5/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(part5 main.cpp diff --git a/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt b/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt index 001f6d8070..8c35a4027d 100644 --- a/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/1_readonly/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(mv_readonly main.cpp diff --git a/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt b/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt index 6b9d5732cf..8a872c928f 100644 --- a/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/2_formatting/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(mv_formatting main.cpp diff --git a/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt b/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt index 52c4ddfc38..04939138fa 100644 --- a/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/3_changingmodel/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(mv_changingmodel main.cpp diff --git a/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt b/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt index b248a47f57..f4f9b7ae84 100644 --- a/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/4_headers/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(mv_headers main.cpp diff --git a/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt b/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt index d40e8674d8..1f70f4a0bf 100644 --- a/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/5_edit/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(mv_edit main.cpp diff --git a/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt b/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt index 592f7bb528..9300b9e837 100644 --- a/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/6_treeview/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(mv_tree main.cpp diff --git a/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt b/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt index 65b58dfa74..0e397deadd 100644 --- a/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/7_selections/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(mv_selections main.cpp diff --git a/examples/widgets/tutorials/notepad/CMakeLists.txt b/examples/widgets/tutorials/notepad/CMakeLists.txt index 2d1b13e469..8a9b39871e 100644 --- a/examples/widgets/tutorials/notepad/CMakeLists.txt +++ b/examples/widgets/tutorials/notepad/CMakeLists.txt @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.14) project(notepad LANGUAGES CXX) -find_package(Qt5 COMPONENTS Widgets) # special case: add -find_package(Qt5 COMPONENTS PrintSupport) # special case: add +find_package(Qt6 COMPONENTS Widgets) # special case: add +find_package(Qt6 COMPONENTS PrintSupport) # special case: add set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt b/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt index f6192757b2..cfbb5fe430 100644 --- a/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/childwidget/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(childwidget main.cpp diff --git a/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt b/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt index 59f0053c1e..4bdde3b10c 100644 --- a/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/nestedlayouts/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(nestedlayouts main.cpp diff --git a/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt b/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt index 033746d0d7..c9636c17b4 100644 --- a/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/toplevel/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(toplevel main.cpp diff --git a/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt b/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt index 3f3335d9e7..6e247de6b6 100644 --- a/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/windowlayout/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(windowlayout main.cpp |