diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-01-23 13:09:26 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-01-23 12:29:44 +0000 |
| commit | c269c700281914f5c5893bc7fe84c748df0fede8 (patch) | |
| tree | d387aeaddcb8d8322f256745bf0bc58c0792362f /PySide2/QtQuick | |
| parent | 96bed2e573d8251f0cc8598c24b2e6340deaca0a (diff) | |
Fix PySide QtQuick build with Qt 5.5.1
QQuickAsyncImageProvider and QQuickImageResponse were first introduced
in Qt 5.6. They were not conditionally added in PySide, and thus
building with Qt 5.5.1 failed.
Fix consists in conditionally building the bindings for the relevant
classes and enums.
Task-number: PYSIDE-355
Change-Id: Ic4fefb661931c4937af51db06eb30ea92c8466e0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'PySide2/QtQuick')
| -rw-r--r-- | PySide2/QtQuick/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | PySide2/QtQuick/typesystem_quick.xml | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/PySide2/QtQuick/CMakeLists.txt b/PySide2/QtQuick/CMakeLists.txt index f5b67eec9..11cbdf750 100644 --- a/PySide2/QtQuick/CMakeLists.txt +++ b/PySide2/QtQuick/CMakeLists.txt @@ -3,12 +3,10 @@ project(QtQuick) set(QtQuick_registerType "${QtQuick_SOURCE_DIR}/pysidequickregistertype.cpp") set(QtQuick_SRC -${QtQuick_GEN_DIR}/qquickasyncimageprovider_wrapper.cpp ${QtQuick_GEN_DIR}/qquickframebufferobject_wrapper.cpp ${QtQuick_GEN_DIR}/qquickframebufferobject_renderer_wrapper.cpp ${QtQuick_GEN_DIR}/qquicktexturefactory_wrapper.cpp ${QtQuick_GEN_DIR}/qquickimageprovider_wrapper.cpp -${QtQuick_GEN_DIR}/qquickimageresponse_wrapper.cpp ${QtQuick_GEN_DIR}/qquicktransform_wrapper.cpp ${QtQuick_GEN_DIR}/qquickitem_wrapper.cpp ${QtQuick_GEN_DIR}/qquickitem_updatepaintnodedata_wrapper.cpp @@ -52,6 +50,14 @@ ${QtQuick_GEN_DIR}/qsgtransformnode_wrapper.cpp ${QtQuick_GEN_DIR}/qtquick_module_wrapper.cpp ) +if (Qt5Quick_VERSION VERSION_GREATER 5.5.1) + set(QtQuick_SRC ${QtQuick_SRC} + ${QtQuick_GEN_DIR}/qquickasyncimageprovider_wrapper.cpp + ${QtQuick_GEN_DIR}/qquickimageresponse_wrapper.cpp + ) +endif() + + make_path(QtQuick_typesystem_path ${QtCore_SOURCE_DIR} ${QtCore_BINARY_DIR} ${QtGui_SOURCE_DIR} ${QtGui_BINARY_DIR} ${QtNetwork_SOURCE_DIR} ${QtNetwork_BINARY_DIR} diff --git a/PySide2/QtQuick/typesystem_quick.xml b/PySide2/QtQuick/typesystem_quick.xml index 21d53d23d..ee3364264 100644 --- a/PySide2/QtQuick/typesystem_quick.xml +++ b/PySide2/QtQuick/typesystem_quick.xml @@ -55,14 +55,14 @@ PySide::initQuickSupport(module); </inject-code> - <object-type name="QQuickAsyncImageProvider" /> + <object-type name="QQuickAsyncImageProvider" since="5.6" /> <object-type name="QQuickFramebufferObject" /> <object-type name="QQuickFramebufferObject::Renderer" /> <object-type name="QQuickTextureFactory" /> <object-type name="QQuickImageProvider" /> - <object-type name="QQuickImageResponse" /> + <object-type name="QQuickImageResponse" since="5.6" /> <object-type name="QQuickTransform" /> <object-type name="QQuickItem"> |