diff options
| author | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2021-04-06 23:00:32 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-08 21:01:04 +0000 |
| commit | fed46903ae5e5566e34daf34126bb00224f1533e (patch) | |
| tree | af20b5ef2fc785c0bab96a85a9169db62cdf7f4b | |
| parent | 6f7c6833a81d47c53b8596c93d8f1ad5ed785e69 (diff) | |
cmake: bump general Qt minimum version
The main cmake files for pyside/shiboken still have
minimum versions pointing to version <6.0.0 which
is not valid anymore.
Change-Id: Iffebec1e6782e627fc6b3a0c9e16bce7864e250f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 59345eeef93d5bbd1af55426e2edf1963dcfb90c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | sources/cmake_helpers/helpers.cmake | 2 | ||||
| -rw-r--r-- | sources/pyside6/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/shiboken6/ApiExtractor/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | sources/shiboken6/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/shiboken6/tests/CMakeLists.txt | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sources/cmake_helpers/helpers.cmake b/sources/cmake_helpers/helpers.cmake index 98a74251a..6a62583f3 100644 --- a/sources/cmake_helpers/helpers.cmake +++ b/sources/cmake_helpers/helpers.cmake @@ -47,7 +47,7 @@ if(WIN32) list(APPEND ALL_OPTIONAL_MODULES AxContainer) endif() list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineCore WebEngine WebEngineWidgets WebSockets) -if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 5.9.3) # Depending on fixes in Qt3D +if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 6.0.2) list(APPEND ALL_OPTIONAL_MODULES 3DCore 3DRender 3DInput 3DLogic 3DAnimation 3DExtras) endif() if(WIN32) diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt index 5133e878e..22c1e52d4 100644 --- a/sources/pyside6/CMakeLists.txt +++ b/sources/pyside6/CMakeLists.txt @@ -79,7 +79,7 @@ if (SHIBOKEN_PYTHON_LIMITED_API) message(STATUS "******************************************************") endif() -find_package(Qt${QT_MAJOR_VERSION} 5.12 REQUIRED COMPONENTS Core) +find_package(Qt${QT_MAJOR_VERSION} 6.0 REQUIRED COMPONENTS Core) add_definitions(${Qt${QT_MAJOR_VERSION}Core_DEFINITIONS}) option(BUILD_TESTS "Build tests." TRUE) diff --git a/sources/shiboken6/ApiExtractor/CMakeLists.txt b/sources/shiboken6/ApiExtractor/CMakeLists.txt index 94571aee0..a9594b94e 100644 --- a/sources/shiboken6/ApiExtractor/CMakeLists.txt +++ b/sources/shiboken6/ApiExtractor/CMakeLists.txt @@ -43,7 +43,7 @@ parser/enumvalue.cpp xmlutils.cpp ) -find_package(Qt${QT_MAJOR_VERSION}Xml 5.12) +find_package(Qt${QT_MAJOR_VERSION}Xml 6.0) find_package(LibXml2 2.6.32) find_package(LibXslt 1.1.19) @@ -89,7 +89,7 @@ target_compile_definitions(apiextractor PRIVATE CMAKE_CXX_COMPILER="${CMAKE_CXX_ set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE) if (BUILD_TESTS) - find_package(Qt${QT_MAJOR_VERSION}Test 5.12 REQUIRED) + find_package(Qt${QT_MAJOR_VERSION}Test 6.0 REQUIRED) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/tests) enable_testing() add_subdirectory(tests) diff --git a/sources/shiboken6/CMakeLists.txt b/sources/shiboken6/CMakeLists.txt index 5d3f4d439..ce577c23e 100644 --- a/sources/shiboken6/CMakeLists.txt +++ b/sources/shiboken6/CMakeLists.txt @@ -20,7 +20,7 @@ option(DISABLE_DOCSTRINGS "Disable documentation extraction." FALSE) set (QT_MAJOR_VERSION 6) message(STATUS "Using Qt ${QT_MAJOR_VERSION}") -find_package(Qt${QT_MAJOR_VERSION} 5.12 REQUIRED COMPONENTS Core) +find_package(Qt${QT_MAJOR_VERSION} 6.0 REQUIRED COMPONENTS Core) if (QUIET_BUILD) set_quiet_build() diff --git a/sources/shiboken6/tests/CMakeLists.txt b/sources/shiboken6/tests/CMakeLists.txt index 76b94d4c1..bfa92e229 100644 --- a/sources/shiboken6/tests/CMakeLists.txt +++ b/sources/shiboken6/tests/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16) if(BUILD_TESTS) - find_package(Qt${QT_MAJOR_VERSION}Test 5.12 REQUIRED) + find_package(Qt${QT_MAJOR_VERSION}Test 6.0 REQUIRED) endif() add_subdirectory(libminimal) |