diff options
| -rw-r--r-- | PySide2/QtCore/typesystem_core_common.xml | 2 | ||||
| -rw-r--r-- | PySide2/QtQml/typesystem_qml.xml | 2 | ||||
| -rw-r--r-- | PySide2/QtQuick/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | PySide2/QtQuick/typesystem_quick.xml | 4 |
4 files changed, 12 insertions, 6 deletions
diff --git a/PySide2/QtCore/typesystem_core_common.xml b/PySide2/QtCore/typesystem_core_common.xml index 5d3dfd246..1b1919b62 100644 --- a/PySide2/QtCore/typesystem_core_common.xml +++ b/PySide2/QtCore/typesystem_core_common.xml @@ -903,7 +903,7 @@ <enum-type name="ImageConversionFlag" flags="ImageConversionFlags" /> <enum-type name="InputMethodHint" flags="InputMethodHints" since="4.6"/> <enum-type name="InputMethodQuery" flags="InputMethodQueries" /> - <enum-type name="EnterKeyType"/> + <enum-type name="EnterKeyType" since="5.6" /> <enum-type name="ItemDataRole" force-integer="yes" /> <enum-type name="ItemFlag" flags="ItemFlags"/> <enum-type name="ItemSelectionMode"/> diff --git a/PySide2/QtQml/typesystem_qml.xml b/PySide2/QtQml/typesystem_qml.xml index 86a448989..427b82d90 100644 --- a/PySide2/QtQml/typesystem_qml.xml +++ b/PySide2/QtQml/typesystem_qml.xml @@ -94,7 +94,7 @@ </inject-code> <object-type name="QJSEngine"> - <enum-type name="Extension" flags="Extensions" /> + <enum-type name="Extension" flags="Extensions" since="5.6" /> <add-function signature="toScriptValue(const QVariant&)" return-type="QJSValue"> <inject-code class="target" position="end"> %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(%1); 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"> |