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/PySide6/QtQml/pysideqmlregistertype.cpp | |
| 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/PySide6/QtQml/pysideqmlregistertype.cpp')
| -rw-r--r-- | sources/pyside6/PySide6/QtQml/pysideqmlregistertype.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sources/pyside6/PySide6/QtQml/pysideqmlregistertype.cpp b/sources/pyside6/PySide6/QtQml/pysideqmlregistertype.cpp index b9f66f98b..ffa337b93 100644 --- a/sources/pyside6/PySide6/QtQml/pysideqmlregistertype.cpp +++ b/sources/pyside6/PySide6/QtQml/pysideqmlregistertype.cpp @@ -51,7 +51,11 @@ #include <pyside_p.h> #include <QtCore/QMutex> +#include <QtCore/QTypeRevision> + +#include <QtQml/qqml.h> #include <QtQml/QJSValue> +#include <QtQml/QQmlListProperty> // Mutex used to avoid race condition on PySide::nextQObjectMemoryAddr. static QMutex nextQmlElementMutex; @@ -113,14 +117,12 @@ int PySide::qmlRegisterType(PyObject *pyObj, const char *uri, int versionMajor, // Allow registering Qt Quick items. bool registered = false; -#ifdef PYSIDE_QML_SUPPORT QuickRegisterItemFunction quickRegisterItemFunction = getQuickRegisterItemFunction(); if (quickRegisterItemFunction) { registered = quickRegisterItemFunction(pyObj, uri, versionMajor, versionMinor, qmlName, creatable, noCreationReason, &type); } -#endif // Register as simple QObject rather than Qt Quick item. if (!registered) { |