diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-12-14 14:48:17 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-12-16 15:05:20 +0100 |
| commit | e35ade02815594d30ed3019773721b86ffe673e0 (patch) | |
| tree | 94212a46eebe44e25a2149ea740bf5eac16be233 | |
| parent | 68db559785269770ca2e4ea4f10361fcea2829d8 (diff) | |
PySide6: Fix CMake UNITY_BUILD (jumbo) builds for modules
Use a header-guard like technique to prevent clashes.
Task-number: PYSIDE-2155
Change-Id: I942f65ef326ede3e29d7afca301da5a14fe5b0a2
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtwidgets.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/glue/qtwidgets.cpp b/sources/pyside6/PySide6/glue/qtwidgets.cpp index a70c0a6e1..09ba081a1 100644 --- a/sources/pyside6/PySide6/glue/qtwidgets.cpp +++ b/sources/pyside6/PySide6/glue/qtwidgets.cpp @@ -213,6 +213,9 @@ if (_widget) { // @snippet qtoolbox-removeitem // @snippet qlayout-help-functions +#ifndef _QLAYOUT_HELP_FUNCTIONS_ +#define _QLAYOUT_HELP_FUNCTIONS_ // Guard for jumbo builds + void addLayoutOwnership(QLayout *layout, QLayoutItem *item); void removeLayoutOwnership(QLayout *layout, QWidget *widget); @@ -330,6 +333,7 @@ inline void removeLayoutOwnership(QLayout *layout, QWidget *widget) removeLayoutOwnership(layout, item); } } +#endif // _QLAYOUT_HELP_FUNCTIONS_ // @snippet qlayout-help-functions // @snippet qlayout-setalignment @@ -434,11 +438,14 @@ for (int i = 0, count = %CPPSELF.count(); i < count; ++i) { // @snippet qlistwidget-clear // @snippet qwidget-retrieveobjectname +#ifndef _RETRIEVEOBJECTNAME_ +#define _RETRIEVEOBJECTNAME_ // Guard for jumbo builds static QByteArray retrieveObjectName(PyObject *obj) { Shiboken::AutoDecRef objName(PyObject_Str(obj)); return Shiboken::String::toCString(objName); } +#endif // @snippet qwidget-retrieveobjectname // @snippet qwidget-glue |