From 4d3b9da999a5ab194b79c9d2f5bcf985ea6d14cc Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 10 Nov 2021 13:40:10 +0100 Subject: 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 --- sources/pyside6/libpyside/pyside.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sources/pyside6/libpyside/pyside.h') 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 -#ifdef PYSIDE_QML_SUPPORT -# include -#endif - #include #include +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. -- cgit v1.2.3