diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-11-10 13:40:10 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-11-11 13:28:00 +0100 |
| commit | 4d3b9da999a5ab194b79c9d2f5bcf985ea6d14cc (patch) | |
| tree | 17be21f464a946bcf4aa09e0ed418e6e687e295d /sources/pyside6/libpyside | |
| parent | 9c7d7a5d19b4a1f57d67694f03a90ddd3b3ff4a9 (diff) | |
PySide6: Remove QML includes from pyside.h
Forward-declare QQmlPrivate::RegisterType. This requires adding
some includes in dependent modules.
[ChangeLog][PySide6] pyside.h no longer includes QML headers.
Pick-to: 6.2
Change-Id: I7d7b703d46e45adbb714d817f05b5480b35d4a4c
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/libpyside')
| -rw-r--r-- | sources/pyside6/libpyside/pyside.cpp | 2 | ||||
| -rw-r--r-- | sources/pyside6/libpyside/pyside.h | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sources/pyside6/libpyside/pyside.cpp b/sources/pyside6/libpyside/pyside.cpp index 4fc29597f..17c673149 100644 --- a/sources/pyside6/libpyside/pyside.cpp +++ b/sources/pyside6/libpyside/pyside.cpp @@ -475,7 +475,6 @@ PyObject *getWrapperForQObject(QObject *cppSelf, PyTypeObject *sbk_type) return pyOut; } -#ifdef PYSIDE_QML_SUPPORT static QuickRegisterItemFunction quickRegisterItem; QuickRegisterItemFunction getQuickRegisterItemFunction() @@ -487,7 +486,6 @@ void setQuickRegisterItemFunction(QuickRegisterItemFunction function) { quickRegisterItem = function; } -#endif // PYSIDE_QML_SUPPORT // Inspired by Shiboken::String::toCString; QString pyStringToQString(PyObject *str) diff --git a/sources/pyside6/libpyside/pyside.h b/sources/pyside6/libpyside/pyside.h index 0362351ea..3b1c85333 100644 --- a/sources/pyside6/libpyside/pyside.h +++ b/sources/pyside6/libpyside/pyside.h @@ -44,13 +44,14 @@ #include <pysidemacros.h> -#ifdef PYSIDE_QML_SUPPORT -# include <QtQml/qqml.h> -#endif - #include <QtCore/QMetaType> #include <QtCore/QHash> +namespace QQmlPrivate +{ +struct RegisterType; +} + namespace PySide { @@ -150,7 +151,7 @@ PYSIDE_API PyObject *getWrapperForQObject(QObject *cppSelf, PyTypeObject *sbk_ty /// \return type object PYSIDE_API PyTypeObject *getTypeForQObject(const QObject *cppSelf); -#ifdef PYSIDE_QML_SUPPORT + // Used by QtQuick module to notify QtQml that custom QtQuick items can be registered. using QuickRegisterItemFunction = bool (*)(PyObject *pyObj, const char *uri, int versionMajor, @@ -159,7 +160,6 @@ using QuickRegisterItemFunction = QQmlPrivate::RegisterType *); PYSIDE_API QuickRegisterItemFunction getQuickRegisterItemFunction(); PYSIDE_API void setQuickRegisterItemFunction(QuickRegisterItemFunction function); -#endif // PYSIDE_QML_SUPPORT /** * Given A PyObject repesenting ASCII or Unicode data, returns an equivalent QString. |