diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-03-27 11:23:29 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-03-27 09:38:44 +0000 |
| commit | b63c4e74b68d4796a4ce274d81c526c0a04beb26 (patch) | |
| tree | 9069e95354c5a76666fdb6128caf5091096cddf8 | |
| parent | 47990e07382d32fbc496ab2813f37bf803127eea (diff) | |
Fix build QML private API headers are missing
The QML / Quick item registration code depended on the presence of the
PYSIDE_QML_SUPPORT define being set, which is set only when the build
system finds the QML private API headers.
Make sure to use PYSIDE_QML_SUPPORT in all the relevant places.
Task-number: PYSIDE-489
Change-Id: I804395bcb10f1b6827f13bd92ec764dc861c544e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | PySide2/QtQml/pysideqmlregistertype.cpp | 2 | ||||
| -rw-r--r-- | PySide2/QtQuick/pysidequickregistertype.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/PySide2/QtQml/pysideqmlregistertype.cpp b/PySide2/QtQml/pysideqmlregistertype.cpp index 464e253d..3e217a70 100644 --- a/PySide2/QtQml/pysideqmlregistertype.cpp +++ b/PySide2/QtQml/pysideqmlregistertype.cpp @@ -135,11 +135,13 @@ 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, &type); } +#endif // Register as simple QObject rather than Qt Quick item. if (!registered) { diff --git a/PySide2/QtQuick/pysidequickregistertype.cpp b/PySide2/QtQuick/pysidequickregistertype.cpp index 22063838..6468068a 100644 --- a/PySide2/QtQuick/pysidequickregistertype.cpp +++ b/PySide2/QtQuick/pysidequickregistertype.cpp @@ -247,5 +247,7 @@ void PySide::initQuickSupport(PyObject *module) { Q_UNUSED(module); ElementFactory<PYSIDE_MAX_QUICK_TYPES - 1>::init(); +#ifdef PYSIDE_QML_SUPPORT setQuickRegisterItemFunction(quickRegisterType); +#endif } |