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/qtconcurrent | |
| 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/qtconcurrent')
| -rw-r--r-- | examples/qtconcurrent/imagescaling/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/qtconcurrent/map/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/qtconcurrent/map/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/qtconcurrent/progressdialog/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/qtconcurrent/runfunction/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/qtconcurrent/wordcount/CMakeLists.txt | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/examples/qtconcurrent/imagescaling/CMakeLists.txt b/examples/qtconcurrent/imagescaling/CMakeLists.txt index f75291cabd..5d487ab409 100644 --- a/examples/qtconcurrent/imagescaling/CMakeLists.txt +++ b/examples/qtconcurrent/imagescaling/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Concurrent) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Concurrent) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(imagescaling imagescaling.cpp imagescaling.h diff --git a/examples/qtconcurrent/map/.prev_CMakeLists.txt b/examples/qtconcurrent/map/.prev_CMakeLists.txt index 48a18038ad..cd53409ec8 100644 --- a/examples/qtconcurrent/map/.prev_CMakeLists.txt +++ b/examples/qtconcurrent/map/.prev_CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Concurrent) +find_package(Qt6 COMPONENTS Concurrent) add_executable(mapdemo main.cpp diff --git a/examples/qtconcurrent/map/CMakeLists.txt b/examples/qtconcurrent/map/CMakeLists.txt index f6d7253847..1707825b8f 100644 --- a/examples/qtconcurrent/map/CMakeLists.txt +++ b/examples/qtconcurrent/map/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Concurrent) -find_package(Qt5 COMPONENTS Gui) # special case +find_package(Qt6 COMPONENTS Concurrent) +find_package(Qt6 COMPONENTS Gui) # special case add_executable(mapdemo main.cpp diff --git a/examples/qtconcurrent/progressdialog/CMakeLists.txt b/examples/qtconcurrent/progressdialog/CMakeLists.txt index 0eff435ed2..f9e7980b63 100644 --- a/examples/qtconcurrent/progressdialog/CMakeLists.txt +++ b/examples/qtconcurrent/progressdialog/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Concurrent) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Concurrent) +find_package(Qt6 COMPONENTS Widgets) add_executable(progressdialog main.cpp diff --git a/examples/qtconcurrent/runfunction/CMakeLists.txt b/examples/qtconcurrent/runfunction/CMakeLists.txt index 95f53e8637..de20553212 100644 --- a/examples/qtconcurrent/runfunction/CMakeLists.txt +++ b/examples/qtconcurrent/runfunction/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Concurrent) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Concurrent) +find_package(Qt6 COMPONENTS Widgets) add_executable(runfunction main.cpp diff --git a/examples/qtconcurrent/wordcount/CMakeLists.txt b/examples/qtconcurrent/wordcount/CMakeLists.txt index 8e79f716c6..e4afbaa4c5 100644 --- a/examples/qtconcurrent/wordcount/CMakeLists.txt +++ b/examples/qtconcurrent/wordcount/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Concurrent) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Concurrent) +find_package(Qt6 COMPONENTS Widgets) add_executable(wordcount main.cpp |