4 files changed, 10 insertions, 12 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) {
diff --git a/sources/pyside6/PySide6/QtQuick/pysidequickregistertype.cpp b/sources/pyside6/PySide6/QtQuick/pysidequickregistertype.cpp
index 542482d32..852fbd8de 100644
--- a/sources/pyside6/PySide6/QtQuick/pysidequickregistertype.cpp
+++ b/sources/pyside6/PySide6/QtQuick/pysidequickregistertype.cpp
@@ -244,12 +244,10 @@ bool quickRegisterType(PyObject *pyObj, const char *uri, int versionMajor, int v
 void PySide::initQuickSupport(PyObject *module)
 {
     Q_UNUSED(module);
-#ifdef PYSIDE_QML_SUPPORT
     // We need to manually register a pointer version of these types in order for them to be used as property types.
     qRegisterMetaType<QQuickPaintedItem*>("QQuickPaintedItem*");
     qRegisterMetaType<QQuickFramebufferObject*>("QQuickFramebufferObject*");
     qRegisterMetaType<QQuickItem*>("QQuickItem*");
 
     setQuickRegisterItemFunction(quickRegisterType);
-#endif
 }
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.