diff options
| author | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2021-04-06 22:57:42 +0200 |
|---|---|---|
| committer | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2021-04-08 23:00:58 +0200 |
| commit | 6f7c6833a81d47c53b8596c93d8f1ad5ed785e69 (patch) | |
| tree | 8e3bf8eef464cb217337a4e5e91d6c5845894c68 /sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt | |
| parent | 386f79a2b3725bd6158bfc668772d6b84cf0c1b0 (diff) | |
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 <Friedemann.Kleint@qt.io>
(cherry picked from commit 985ee0b6e55bc116f287ff2a09265fd3ef629f37)
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt')
| -rw-r--r-- | sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt | 18 |
1 files changed, 7 insertions, 11 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} |