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/graphicsview | |
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/graphicsview')
13 files changed, 17 insertions, 17 deletions
diff --git a/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt index 7137e76d9b..021628a7ff 100644 --- a/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/anchorlayout/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(anchorlayout main.cpp diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt b/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt index afe4475bbf..527e33b826 100644 --- a/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt +++ b/examples/widgets/graphicsview/basicgraphicslayouts/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(basicgraphicslayouts basicgraphicslayouts.qrc diff --git a/examples/widgets/graphicsview/boxes/CMakeLists.txt b/examples/widgets/graphicsview/boxes/CMakeLists.txt index 856dfd1716..0be040f90e 100644 --- a/examples/widgets/graphicsview/boxes/CMakeLists.txt +++ b/examples/widgets/graphicsview/boxes/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS OpenGL) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS OpenGL) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(boxes diff --git a/examples/widgets/graphicsview/chip/CMakeLists.txt b/examples/widgets/graphicsview/chip/CMakeLists.txt index f02cbacf37..302a8a56ca 100644 --- a/examples/widgets/graphicsview/chip/CMakeLists.txt +++ b/examples/widgets/graphicsview/chip/CMakeLists.txt @@ -11,9 +11,9 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Widgets) -find_package(Qt5 COMPONENTS OpenGL) # special case -find_package(Qt5 COMPONENTS PrintSupport) # special case +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS OpenGL) # special case +find_package(Qt6 COMPONENTS PrintSupport) # special case add_qt_gui_executable(chip chip.cpp chip.h diff --git a/examples/widgets/graphicsview/collidingmice/CMakeLists.txt b/examples/widgets/graphicsview/collidingmice/CMakeLists.txt index 2817710600..aeda9367a3 100644 --- a/examples/widgets/graphicsview/collidingmice/CMakeLists.txt +++ b/examples/widgets/graphicsview/collidingmice/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(collidingmice main.cpp diff --git a/examples/widgets/graphicsview/diagramscene/CMakeLists.txt b/examples/widgets/graphicsview/diagramscene/CMakeLists.txt index b1baf34b2d..5c7de9c7cd 100644 --- a/examples/widgets/graphicsview/diagramscene/CMakeLists.txt +++ b/examples/widgets/graphicsview/diagramscene/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(diagramscene arrow.cpp arrow.h diff --git a/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt b/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt index df6d2ec4e8..ef367d461f 100644 --- a/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt +++ b/examples/widgets/graphicsview/dragdroprobot/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(dragdroprobot coloritem.cpp coloritem.h diff --git a/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt b/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt index 5fc7a424b0..a5d367e2d2 100644 --- a/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt +++ b/examples/widgets/graphicsview/elasticnodes/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(elasticnodes edge.cpp edge.h diff --git a/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt b/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt index bfa68f15cb..9e3059176b 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt +++ b/examples/widgets/graphicsview/embeddeddialogs/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(embeddeddialogs customproxy.cpp customproxy.h diff --git a/examples/widgets/graphicsview/flowlayout/CMakeLists.txt b/examples/widgets/graphicsview/flowlayout/CMakeLists.txt index 14b6ea8561..45851ca107 100644 --- a/examples/widgets/graphicsview/flowlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/flowlayout/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(graphicsview_flowlayout # special case: renamed flowlayout flowlayout.cpp flowlayout.h diff --git a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt index 2db8aa1cde..7fc6ec1459 100644 --- a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt +++ b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Widgets) -find_package(Qt5 COMPONENTS OpenGL) # special case +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS OpenGL) # special case add_executable(padnavigator flippablepad.cpp flippablepad.h diff --git a/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt index f8def269b6..56e3199cc9 100644 --- a/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/simpleanchorlayout/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(simpleanchorlayout main.cpp diff --git a/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt index 939e6c3fc7..a9745c54e1 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/weatheranchorlayout/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(weatheranchorlayout main.cpp |