diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-04 08:06:26 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-04 08:06:30 +0200 |
| commit | 567a7196fdb37312a90e07c05b46e1e5e5bcc1c2 (patch) | |
| tree | bc785eca5697d7b32415cf8f030adf7c37652a27 /sources/pyside2/libpyside/pyside.cpp | |
| parent | fafd06df5f87f13df7136cc903f4d7e094510325 (diff) | |
| parent | 3d34fd298735ba352d0b6e48a7778f8820a9ddc2 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie8025300580981c5349b31d4846a7f659481991d
Diffstat (limited to 'sources/pyside2/libpyside/pyside.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/pyside.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp index b70743cee..367a1adc2 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 { |