diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-10-18 09:37:43 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-10-18 18:01:59 +0000 |
| commit | f73cc022754a2ddaf318c248ad5e10f7f791586e (patch) | |
| tree | f6028a3f42a1b6775e3c73bd4648f179b4573fed | |
| parent | f88b26881bdcab12a4eda95d941ce020476952cb (diff) | |
Fix Unity build of QtQuick
qsgrendernode_renderstate_wrapper.cpp and
qsgmaterialshader_renderstate_wrapper.cpp have static helper functions
named "renderstate_..." that might clash when the order changes due
further sources being added.
Amends 277783b47e704505f19d00dd80f26239082974d6.
Task-number: PYSIDE-2155
Change-Id: I9873f2697b03aa1650847d0daaa622930d74c39d
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
(cherry picked from commit 3073b96abf9cab6e725afdb512c9913754447441)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 8f27611ab0afb8c9cee5d49898ceb905be71493e)
| -rw-r--r-- | sources/pyside6/PySide6/QtQuick/CMakeLists.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sources/pyside6/PySide6/QtQuick/CMakeLists.txt b/sources/pyside6/PySide6/QtQuick/CMakeLists.txt index e182d86b7..497d31818 100644 --- a/sources/pyside6/PySide6/QtQuick/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtQuick/CMakeLists.txt @@ -5,7 +5,17 @@ project(QtQuick) set(QtQuick_registerType "${QtQuick_SOURCE_DIR}/pysidequickregistertype.cpp") +# Exclude sources that have clashing static helper functions named "renderstate_..." +set(QtQuick_SRC_UNITY_EXCLUDED_SRC + ${QtQuick_GEN_DIR}/qsgrendernode_renderstate_wrapper.cpp + ${QtQuick_GEN_DIR}/qsgmaterialshader_renderstate_wrapper.cpp +) + +set_property(SOURCE ${QtQuick_SRC_UNITY_EXCLUDED_SRC} + PROPERTY SKIP_UNITY_BUILD_INCLUSION ON) + set(QtQuick_SRC +${QtQuick_SRC_UNITY_EXCLUDED_SRC} ${QtQuick_GEN_DIR}/qquickasyncimageprovider_wrapper.cpp ${QtQuick_GEN_DIR}/qquickframebufferobject_wrapper.cpp ${QtQuick_GEN_DIR}/qquickframebufferobject_renderer_wrapper.cpp @@ -37,7 +47,6 @@ ${QtQuick_GEN_DIR}/qsggeometry_texturedpoint2d_wrapper.cpp ${QtQuick_GEN_DIR}/qsggeometry_wrapper.cpp ${QtQuick_GEN_DIR}/qsggeometrynode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgmaterial_wrapper.cpp -${QtQuick_GEN_DIR}/qsgmaterialshader_renderstate_wrapper.cpp ${QtQuick_GEN_DIR}/qsgmaterialshader_wrapper.cpp ${QtQuick_GEN_DIR}/qsgmaterialtype_wrapper.cpp ${QtQuick_GEN_DIR}/qsgnode_wrapper.cpp @@ -46,7 +55,6 @@ ${QtQuick_GEN_DIR}/qsgopaquetexturematerial_wrapper.cpp #${QtQuick_GEN_DIR}/qsgsimplematerial_wrapper.cpp #${QtQuick_GEN_DIR}/qsgsimplematerialshader_wrapper.cpp ${QtQuick_GEN_DIR}/qsgrectanglenode_wrapper.cpp -${QtQuick_GEN_DIR}/qsgrendernode_renderstate_wrapper.cpp ${QtQuick_GEN_DIR}/qsgrendernode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgsimplerectnode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgsimpletexturenode_wrapper.cpp |