diff options
Diffstat (limited to 'sources/pyside2')
4 files changed, 8 insertions, 5 deletions
diff --git a/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml b/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml index a74c3ab93..1c7e1109b 100644 --- a/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml +++ b/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml @@ -73,11 +73,11 @@ </object-type> <object-type name="QMouseEvent"> <enum-type name="Buttons"/> - <enum-type name="Modifiers"/> + <enum-type name="Modifier" flags="Modifiers" since="5.14"/> </object-type> <object-type name="QWheelEvent"> <enum-type name="Buttons"/> - <enum-type name="Modifiers"/> + <enum-type name="Modifier" flags="Modifiers" since="5.14"/> </object-type> <object-type name="QMouseHandler"/> <!-- On windows this raise the following error: diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index efb68a310..95b85a918 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -2949,6 +2949,9 @@ <modify-function signature="borderColor(unsigned int*)const" remove="all"/> <modify-function signature="borderColor(int*)const" remove="all"/> <modify-function signature="borderColor(float*)const" remove="all"/> + <!-- Work around link error introduced by qtbase/d15b02ff291e3124d9bb8ac3b06b704c292f52ab, can be removed once + qtbase/1bfabe35d8178c93e66acef21c01e08980f9ed0d has landed --> + <modify-function signature="setData(int,int,int,int,int,int,int,QOpenGLTexture::PixelFormat,QOpenGLTexture::PixelType,const void*,QOpenGLPixelTransferOptions*const)" remove="all"/> </object-type> <object-type name="QOpenGLTextureBlitter"> <enum-type name="Origin"/> diff --git a/sources/pyside2/libpyside/globalreceiverv2.cpp b/sources/pyside2/libpyside/globalreceiverv2.cpp index 170cbf22f..283fb9cd2 100644 --- a/sources/pyside2/libpyside/globalreceiverv2.cpp +++ b/sources/pyside2/libpyside/globalreceiverv2.cpp @@ -283,7 +283,7 @@ int GlobalReceiverV2::refCount(const QObject *link) const void GlobalReceiverV2::notify() { - const auto objSet = QSet<const QObject *>::fromList(m_refs); + const QSet<const QObject *> objSet(m_refs.cbegin(), m_refs.cend()); Py_BEGIN_ALLOW_THREADS for (const QObject *o : objSet) { QMetaObject::disconnect(o, DESTROY_SIGNAL_ID, this, DESTROY_SLOT_ID); diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py index d2dd4960d..78ea0019d 100644 --- a/sources/pyside2/pyside_version.py +++ b/sources/pyside2/pyside_version.py @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of Qt for Python. @@ -38,7 +38,7 @@ ############################################################################# major_version = "5" -minor_version = "13" +minor_version = "14" patch_version = "0" # For example: "a", "b", "rc" |