diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-12-16 16:49:24 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-12-16 20:20:48 +0100 |
| commit | 8d2d8f9c55adc45476673f17aadb879a227412da (patch) | |
| tree | 3633f6ba20bfc275d1dcca5caaee3df766fd05b0 | |
| parent | d3106ced261454e5e05e3dcc60ecd604bef857f5 (diff) | |
PySide6: Remove include module-local include "core_snippets_p.h" from headers
Remove it from the extra includes and Include it in source code only.
Task-number: PYSIDE-2155
Change-Id: I22930060a05bdac2f4642ddc9418a5371d073316
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | sources/pyside6/PySide6/QtCore/typesystem_core_common.xml | 12 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtcore.cpp | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index bdad20892..2df697d31 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -792,8 +792,9 @@ <value-type name="QDate" hash-function="PySide::hash" > <extra-includes> <include file-name="pysideqhash.h" location="global"/> - <include file-name="glue/core_snippets_p.h" location="local"/> </extra-includes> + <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" + snippet="core-snippets-p-h"/> <conversion-rule> <target-to-native> <add-conversion type="Py_None" file="../glue/qtcore.cpp" snippet="conversion-pynone"/> @@ -852,8 +853,9 @@ <value-type name="QDateTime" hash-function="PySide::hash"> <extra-includes> <include file-name="pysideqhash.h" location="global"/> - <include file-name="glue/core_snippets_p.h" location="local"/> </extra-includes> + <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" + snippet="core-snippets-p-h"/> <enum-type name="YearRange"/> <conversion-rule> <target-to-native> @@ -1211,8 +1213,9 @@ <value-type name="QTime" hash-function="PySide::hash"> <extra-includes> <include file-name="pysideqhash.h" location="global"/> - <include file-name="glue/core_snippets_p.h" location="local"/> </extra-includes> + <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" + snippet="core-snippets-p-h"/> <conversion-rule> <target-to-native> <add-conversion type="Py_None" file="../glue/qtcore.cpp" snippet="conversion-pynone"/> @@ -1630,8 +1633,9 @@ <include file-name="QThread" location="global"/> <include file-name="QCoreApplication" location="global"/> <include file-name="signalmanager.h" location="local"/> - <include file-name="glue/core_snippets_p.h" location="local"/> </extra-includes> + <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" + snippet="core-snippets-p-h"/> <modify-function signature="metaObject()const"> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-metaobject"/> <modify-argument index="return"> diff --git a/sources/pyside6/PySide6/glue/qtcore.cpp b/sources/pyside6/PySide6/glue/qtcore.cpp index fc63767c9..dc855ae35 100644 --- a/sources/pyside6/PySide6/glue/qtcore.cpp +++ b/sources/pyside6/PySide6/glue/qtcore.cpp @@ -11,6 +11,10 @@ #include "glue/core_snippets_p.h" // @snippet include-pyside +// @snippet core-snippets-p-h +#include "glue/core_snippets_p.h" +// @snippet core-snippets-p-h + // @snippet qarg_helper // Helper for the Q_ARG/Q_RETURN_ARG functions, creating a meta type |