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/xml | |
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/xml')
-rw-r--r-- | examples/xml/dombookmarks/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/xml/htmlinfo/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/xml/rsslisting/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/xml/saxbookmarks/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/xml/streambookmarks/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/xml/xmlstreamlint/CMakeLists.txt | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/examples/xml/dombookmarks/CMakeLists.txt b/examples/xml/dombookmarks/CMakeLists.txt index f570fe49c5..7a9059393d 100644 --- a/examples/xml/dombookmarks/CMakeLists.txt +++ b/examples/xml/dombookmarks/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Xml) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Xml) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(dombookmarks main.cpp diff --git a/examples/xml/htmlinfo/CMakeLists.txt b/examples/xml/htmlinfo/CMakeLists.txt index 737d4685e5..dde6e17fa0 100644 --- a/examples/xml/htmlinfo/CMakeLists.txt +++ b/examples/xml/htmlinfo/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14) project(htmlinfo LANGUAGES CXX) -find_package(Qt5 COMPONENTS Core) # special case: add +find_package(Qt6 COMPONENTS Core) # special case: add set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/xml/rsslisting/CMakeLists.txt b/examples/xml/rsslisting/CMakeLists.txt index b013404de3..c2c699ac5a 100644 --- a/examples/xml/rsslisting/CMakeLists.txt +++ b/examples/xml/rsslisting/CMakeLists.txt @@ -11,9 +11,9 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Network) -find_package(Qt5 COMPONENTS Xml) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Xml) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(rsslisting main.cpp diff --git a/examples/xml/saxbookmarks/CMakeLists.txt b/examples/xml/saxbookmarks/CMakeLists.txt index 79ce88f182..40244e0e73 100644 --- a/examples/xml/saxbookmarks/CMakeLists.txt +++ b/examples/xml/saxbookmarks/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Xml) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Xml) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(saxbookmarks main.cpp diff --git a/examples/xml/streambookmarks/CMakeLists.txt b/examples/xml/streambookmarks/CMakeLists.txt index 6a93d8b18c..a7ec5dfac7 100644 --- a/examples/xml/streambookmarks/CMakeLists.txt +++ b/examples/xml/streambookmarks/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Xml) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Xml) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(streambookmarks main.cpp diff --git a/examples/xml/xmlstreamlint/CMakeLists.txt b/examples/xml/xmlstreamlint/CMakeLists.txt index d67f25c433..d12b549996 100644 --- a/examples/xml/xmlstreamlint/CMakeLists.txt +++ b/examples/xml/xmlstreamlint/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14) project(xmlstreamlint LANGUAGES CXX) -find_package(Qt5 COMPONENTS Core Xml) # special case: add +find_package(Qt6 COMPONENTS Core Xml) # special case: add set(CMAKE_INCLUDE_CURRENT_DIR ON) |