diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2025-02-26 16:14:50 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2025-06-25 13:16:04 +0200 |
| commit | e5b3dcfe685bf250d25f48111db289c175b112cc (patch) | |
| tree | 877870fe17e91564e97ff4032e95254867a364f4 | |
| parent | 869b0d78599d8f42d6ab2b9f8036c62fd9407562 (diff) | |
Fix PySide build for 6.10
Task-number: PYSIDE-3011
Task-number: QTBUG-87776
Change-Id: If1bbeb6599ef60d72f49a949a30b01f9140c8d97
Reviewed-by: Ece Cinucen <ece.cinucen@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | sources/pyside6/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/pyside6/cmake/PySideHelpers.cmake | 7 | ||||
| -rw-r--r-- | sources/pyside6/cmake/PySideSetup.cmake | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt index 9c238e980..423b96b6f 100644 --- a/sources/pyside6/CMakeLists.txt +++ b/sources/pyside6/CMakeLists.txt @@ -9,6 +9,8 @@ cmake_policy(VERSION 3.18) include(".cmake.conf") project(pysidebindings) +set(QT_NO_PRIVATE_MODULE_WARNING ON) + include(cmake/PySideSetup.cmake) get_rpath_base_token(base) diff --git a/sources/pyside6/cmake/PySideHelpers.cmake b/sources/pyside6/cmake/PySideHelpers.cmake index be1451bc3..b8a3c0c2b 100644 --- a/sources/pyside6/cmake/PySideHelpers.cmake +++ b/sources/pyside6/cmake/PySideHelpers.cmake @@ -235,9 +235,10 @@ macro(collect_module_if_found shortname) # record the shortnames for the tests list(APPEND all_module_shortnames ${shortname}) # Build Qt 5 compatibility variables - if(${QT_MAJOR_VERSION} GREATER_EQUAL 6 AND NOT "${shortname}" STREQUAL "OpenGLFunctions") - get_target_property(Qt6${shortname}_INCLUDE_DIRS Qt6::${shortname} - INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(Qt6${shortname}_INCLUDE_DIRS Qt6::${shortname} + INTERFACE_INCLUDE_DIRECTORIES) + # Find QtGui private headers for exposing some QPA classes + if("${shortname}" STREQUAL "Gui") get_target_property(Qt6${shortname}_PRIVATE_INCLUDE_DIRS Qt6::${shortname}Private INTERFACE_INCLUDE_DIRECTORIES) diff --git a/sources/pyside6/cmake/PySideSetup.cmake b/sources/pyside6/cmake/PySideSetup.cmake index 370eccdf1..7d5df4a4c 100644 --- a/sources/pyside6/cmake/PySideSetup.cmake +++ b/sources/pyside6/cmake/PySideSetup.cmake @@ -97,7 +97,8 @@ if(QFP_QT_HOST_PATH) endif() endif() endif() -find_package(Qt6 REQUIRED COMPONENTS Core) +# Find QtGui private headers for exposing some QPA classes +find_package(Qt6 REQUIRED COMPONENTS Core CorePrivate Gui GuiPrivate) add_definitions(${Qt${QT_MAJOR_VERSION}Core_DEFINITIONS}) |