From 6f7c6833a81d47c53b8596c93d8f1ad5ed785e69 Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Tue, 6 Apr 2021 22:57:42 +0200 Subject: cmake: update minimum Qt version for 6.0+ compat Bumping modules compatibility, using 6.0.0 as the base since we the rename from PySide2 took place already, and this code is not supposed to be backward compatible. Change-Id: I471b151ef50f5a5974561bf2e619017f7beb621a Reviewed-by: Friedemann Kleint (cherry picked from commit 985ee0b6e55bc116f287ff2a09265fd3ef629f37) Reviewed-by: Cristian Maureira-Fredes --- sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt | 18 +++++++----------- sources/pyside6/PySide6/QtLocation/CMakeLists.txt | 6 +----- sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt | 7 +------ sources/pyside6/PySide6/QtPositioning/CMakeLists.txt | 7 +------ sources/pyside6/PySide6/QtScxml/CMakeLists.txt | 14 ++++---------- sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt | 7 +------ 6 files changed, 15 insertions(+), 44 deletions(-) diff --git a/sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt b/sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt index c38c09bbf..35fd7953c 100644 --- a/sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt +++ b/sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt @@ -2,6 +2,9 @@ project(Qt3DExtras) set(Qt3DExtras_SRC ${Qt3DExtras_GEN_DIR}/qt3dextras_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractcameracontroller_inputstate_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractcameracontroller_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractspritesheet_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qconegeometry_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qconemesh_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qcuboidgeometry_wrapper.cpp @@ -10,6 +13,7 @@ ${Qt3DExtras_GEN_DIR}/qt3dextras_qcylindergeometry_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qcylindermesh_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qdiffusemapmaterial_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qdiffusespecularmapmaterial_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qdiffusespecularmaterial_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qextrudedtextgeometry_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qextrudedtextmesh_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qfirstpersoncameracontroller_wrapper.cpp @@ -29,6 +33,9 @@ ${Qt3DExtras_GEN_DIR}/qt3dextras_qplanemesh_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qskyboxentity_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qspheregeometry_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qspheremesh_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qspritegrid_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qspritesheet_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qspritesheetitem_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qtext2dentity_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qtexturematerial_wrapper.cpp ${Qt3DExtras_GEN_DIR}/qt3dextras_qtorusgeometry_wrapper.cpp @@ -37,17 +44,6 @@ ${Qt3DExtras_GEN_DIR}/qt3dextras_qt3dwindow_wrapper.cpp # module is always needed ${Qt3DExtras_GEN_DIR}/qt3dextras_module_wrapper.cpp) -if (Qt${QT_MAJOR_VERSION}3DExtras_VERSION VERSION_EQUAL 5.10.0 - OR Qt${QT_MAJOR_VERSION}3DExtras_VERSION VERSION_GREATER 5.10.0) - list(APPEND Qt3DExtras_SRC - ${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractcameracontroller_wrapper.cpp - ${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractcameracontroller_inputstate_wrapper.cpp - ${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractspritesheet_wrapper.cpp - ${Qt3DExtras_GEN_DIR}/qt3dextras_qdiffusespecularmaterial_wrapper.cpp - ${Qt3DExtras_GEN_DIR}/qt3dextras_qspritegrid_wrapper.cpp - ${Qt3DExtras_GEN_DIR}/qt3dextras_qspritesheet_wrapper.cpp - ${Qt3DExtras_GEN_DIR}/qt3dextras_qspritesheetitem_wrapper.cpp) -endif() set(Qt3DExtras_include_dirs ${Qt3DExtras_SOURCE_DIR} diff --git a/sources/pyside6/PySide6/QtLocation/CMakeLists.txt b/sources/pyside6/PySide6/QtLocation/CMakeLists.txt index 5489afae9..9e58d94ac 100644 --- a/sources/pyside6/PySide6/QtLocation/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtLocation/CMakeLists.txt @@ -10,6 +10,7 @@ ${QtLocation_GEN_DIR}/qgeoroute_wrapper.cpp ${QtLocation_GEN_DIR}/qgeoroutereply_wrapper.cpp ${QtLocation_GEN_DIR}/qgeoroutesegment_wrapper.cpp ${QtLocation_GEN_DIR}/qgeoserviceprovider_wrapper.cpp +${QtLocation_GEN_DIR}/qgeoserviceproviderfactoryv2_wrapper.cpp ${QtLocation_GEN_DIR}/qplace_wrapper.cpp ${QtLocation_GEN_DIR}/qplacecontentreply_wrapper.cpp ${QtLocation_GEN_DIR}/qplacedetailsreply_wrapper.cpp @@ -47,11 +48,6 @@ ${QtLocation_GEN_DIR}/qplacesupplier_wrapper.cpp ${QtLocation_GEN_DIR}/qtlocation_module_wrapper.cpp ) -if (Qt${QT_MAJOR_VERSION}Location_VERSION VERSION_EQUAL 5.11.0 - OR Qt${QT_MAJOR_VERSION}Location_VERSION VERSION_GREATER 5.11.0) - list(APPEND QtLocation_SRC - ${QtLocation_GEN_DIR}/qgeoserviceproviderfactoryv2_wrapper.cpp) -endif() set(QtLocation_include_dirs ${QtLocation_SOURCE_DIR} ${QtLocation_BINARY_DIR} diff --git a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt index bb5048cdb..763fb5a06 100644 --- a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt @@ -45,6 +45,7 @@ ${QtMultimedia_GEN_DIR}/qcameraviewfindersettingscontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameraviewfindersettings_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamera_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamerazoomcontrol_wrapper.cpp +${QtMultimedia_GEN_DIR}/qcustomaudiorolecontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qimageencodercontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qimageencodersettings_wrapper.cpp ${QtMultimedia_GEN_DIR}/qmediaaudioprobecontrol_wrapper.cpp @@ -97,12 +98,6 @@ ${QtMultimedia_GEN_DIR}/qvideowindowcontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qtmultimedia_module_wrapper.cpp ) -if (Qt${QT_MAJOR_VERSION}Multimedia_VERSION VERSION_EQUAL 5.11.0 - OR Qt${QT_MAJOR_VERSION}Multimedia_VERSION VERSION_GREATER 5.11.0) - list(APPEND QtMultimedia_SRC - ${QtMultimedia_GEN_DIR}/qcustomaudiorolecontrol_wrapper.cpp) -endif() - set(QtMultimedia_include_dirs ${QtMultimedia_SOURCE_DIR} ${QtMultimedia_BINARY_DIR} ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} diff --git a/sources/pyside6/PySide6/QtPositioning/CMakeLists.txt b/sources/pyside6/PySide6/QtPositioning/CMakeLists.txt index 6a2942967..125c18ce5 100644 --- a/sources/pyside6/PySide6/QtPositioning/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtPositioning/CMakeLists.txt @@ -11,6 +11,7 @@ ${QtPositioning_GEN_DIR}/qgeolocation_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeocircle_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeocoordinate_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeopath_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeopolygon_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeopositioninfo_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeopositioninfosource_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeopositioninfosourcefactory_wrapper.cpp @@ -23,12 +24,6 @@ ${QtPositioning_GEN_DIR}/qnmeapositioninfosource_wrapper.cpp ${QtPositioning_GEN_DIR}/qtpositioning_module_wrapper.cpp ) -if (Qt${QT_MAJOR_VERSION}Positioning_VERSION VERSION_EQUAL 5.10.0 - OR Qt${QT_MAJOR_VERSION}Positioning_VERSION VERSION_GREATER 5.10.0) - list(APPEND QtPositioning_SRC - ${QtPositioning_GEN_DIR}/qgeopolygon_wrapper.cpp) -endif() - set(QtPositioning_include_dirs ${QtPositioning_SOURCE_DIR} ${QtPositioning_BINARY_DIR} ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} diff --git a/sources/pyside6/PySide6/QtScxml/CMakeLists.txt b/sources/pyside6/PySide6/QtScxml/CMakeLists.txt index 8cb78c9ee..5eaa40a43 100644 --- a/sources/pyside6/PySide6/QtScxml/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtScxml/CMakeLists.txt @@ -6,10 +6,14 @@ set(QtScxml_DROPPED_ENTRIES ) set(QtScxml_SRC ${QtScxml_GEN_DIR}/qscxmlcompiler_wrapper.cpp ${QtScxml_GEN_DIR}/qscxmlcompiler_loader_wrapper.cpp +${QtScxml_GEN_DIR}/qscxmlcppdatamodel_wrapper.cpp +${QtScxml_GEN_DIR}/qscxmldatamodel_foreachloopbody_wrapper.cpp +${QtScxml_GEN_DIR}/qscxmldatamodel_wrapper.cpp ${QtScxml_GEN_DIR}/qscxmlevent_wrapper.cpp ${QtScxml_GEN_DIR}/qscxmldynamicscxmlservicefactory_wrapper.cpp ${QtScxml_GEN_DIR}/qscxmlinvokableservice_wrapper.cpp ${QtScxml_GEN_DIR}/qscxmlinvokableservicefactory_wrapper.cpp +${QtScxml_GEN_DIR}/qscxmlnulldatamodel_wrapper.cpp ${QtScxml_GEN_DIR}/qscxmlstaticscxmlservicefactory_wrapper.cpp ${QtScxml_GEN_DIR}/qscxmlstatemachine_wrapper.cpp ${QtScxml_GEN_DIR}/qscxmltabledata_wrapper.cpp @@ -24,16 +28,6 @@ ${QtScxml_GEN_DIR}/qscxmlexecutablecontent_parameterinfo_wrapper.cpp ${QtScxml_GEN_DIR}/qtscxml_module_wrapper.cpp ) -if (Qt${QT_MAJOR_VERSION}Scxml_VERSION VERSION_EQUAL 5.12.0 - OR Qt${QT_MAJOR_VERSION}Scxml_VERSION VERSION_GREATER 5.12.0) - list(APPEND QtScxml_SRC - ${QtScxml_GEN_DIR}/qscxmldatamodel_wrapper.cpp - ${QtScxml_GEN_DIR}/qscxmldatamodel_foreachloopbody_wrapper.cpp - ${QtScxml_GEN_DIR}/qscxmlecmascriptdatamodel_wrapper.cpp - ${QtScxml_GEN_DIR}/qscxmlcppdatamodel_wrapper.cpp - ${QtScxml_GEN_DIR}/qscxmlnulldatamodel_wrapper.cpp) -endif() - set(QtScxml_include_dirs ${QtScxml_SOURCE_DIR} ${QtScxml_BINARY_DIR} ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} diff --git a/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt b/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt index 7d6995b4c..bb61bf8e2 100644 --- a/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt @@ -6,17 +6,12 @@ ${QtWebEngineCore_GEN_DIR}/qwebenginehttprequest_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebengineurlrequestinfo_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebengineurlrequestinterceptor_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebengineurlrequestjob_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebengineurlscheme_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebengineurlschemehandler_wrapper.cpp # module is always needed ${QtWebEngineCore_GEN_DIR}/qtwebenginecore_module_wrapper.cpp ) -if (Qt${QT_MAJOR_VERSION}WebEngineCore_VERSION VERSION_EQUAL 5.12.0 - OR Qt${QT_MAJOR_VERSION}WebEngineCore_VERSION VERSION_GREATER 5.12.0) - list(APPEND QtWebEngineCore_SRC - ${QtWebEngineCore_GEN_DIR}/qwebengineurlscheme_wrapper.cpp) -endif() - set(QtWebEngineCore_include_dirs ${QtWebEngineCore_SOURCE_DIR} ${QtWebEngineCore_BINARY_DIR} -- cgit v1.2.3