diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-29 14:04:22 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-29 12:19:45 +0000 |
| commit | 1cf05df50c460712f5251bb5edd62c384d64329e (patch) | |
| tree | 53c50dd78d6d6bdb01e634f4099b7540bd80a33a | |
| parent | ef2c47069c545f5afdf767c70add543bac4c77e6 (diff) | |
PySide2: Fix compilation with a with custom namespace specified for Qt
Add missing QT_BEGIN/END_NAMESPACE macros.
Patch as provided on bug report.
Task-number: PYSIDE-635
Change-Id: I7ddb447f1aafeb8da72e7e192905bafe3809797d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 2 | ||||
| -rw-r--r-- | sources/pyside2/libpyside/pyside.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 7e3d86d8a..cc9b5e519 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -4314,6 +4314,7 @@ s1.addTransition(button.clicked, s1h)</code> </add-function> <inject-code class="native" position="beginning"> + QT_BEGIN_NAMESPACE extern bool qRegisterResourceData(int, const unsigned char *, @@ -4325,6 +4326,7 @@ s1.addTransition(button.clicked, s1h)</code> const unsigned char *, const unsigned char *, const unsigned char *); + QT_END_NAMESPACE </inject-code> <add-function signature="qRegisterResourceData(int,PyBytes,PyBytes,PyBytes)" return-type="bool"> <inject-code class="target" position="beginning"> diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp index d6f4e5a37..b4f7d8771 100644 --- a/sources/pyside2/libpyside/pyside.cpp +++ b/sources/pyside2/libpyside/pyside.cpp @@ -72,8 +72,10 @@ static QStack<PySide::CleanupFunction> cleanupFunctionList; static void* qobjectNextAddr; +QT_BEGIN_NAMESPACE extern bool qRegisterResourceData(int, const unsigned char *, const unsigned char *, const unsigned char *); +QT_END_NAMESPACE namespace PySide { |