diff options
Diffstat (limited to 'sources/pyside2')
13 files changed, 102 insertions, 24 deletions
diff --git a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt index 07bd3d89f..1b859ca1e 100644 --- a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt +++ b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt @@ -117,6 +117,14 @@ if (Qt53DRender_VERSION VERSION_EQUAL 5.10.0 OR Qt53DRender_VERSION VERSION_GREA ) endif() +if (Qt53DRender_VERSION VERSION_EQUAL 5.11.0 OR Qt53DRender_VERSION VERSION_GREATER 5.11.0) + list(APPEND Qt3DRender_SRC + ${Qt3DRender_GEN_DIR}/qt3drender_qabstractraycaster_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qraycaster_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qraycasterhit_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qscreenraycaster_wrapper.cpp) +endif() + set(Qt3DRender_include_dirs ${Qt3DRender_SOURCE_DIR} ${Qt3DRender_BINARY_DIR} diff --git a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml index cfa332742..013c79f37 100644 --- a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml +++ b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml @@ -48,6 +48,10 @@ <object-type name="QAbstractLight"> <enum-type name="Type"/> </object-type> + <object-type name="QAbstractRayCaster" since="5.11"> + <enum-type name="RunMode"/> + <enum-type name="FilterMode"/> + </object-type> <object-type name="QAbstractTexture"> <enum-type name="CubeMapFace"/> <enum-type name="ComparisonFunction"/> @@ -163,6 +167,10 @@ </object-type> <object-type name="QPolygonOffset"/> <object-type name="QProximityFilter" since="5.10"/> + <object-type name="QRayCaster" since="5.11"/> + <value-type name="QRayCasterHit" since="5.11"> + <enum-type name="HitType"/> + </value-type> <object-type name="QRenderAspect"> <enum-type name="RenderType"/> </object-type> @@ -186,6 +194,7 @@ <enum-type name="ComponentType"/> </object-type> <object-type name="QScissorTest"/> + <object-type name="QScreenRayCaster" since="5.11"/> <object-type name="QSeamlessCubemap"/> <object-type name="QShaderData"/> <object-type name="QShaderProgram"> diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt index d29c0dfab..5a8a41ec5 100644 --- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt @@ -92,6 +92,8 @@ ${QtCore_GEN_DIR}/qpointf_wrapper.cpp ${QtCore_GEN_DIR}/qprocess_wrapper.cpp ${QtCore_GEN_DIR}/qprocessenvironment_wrapper.cpp ${QtCore_GEN_DIR}/qpropertyanimation_wrapper.cpp +${QtCore_GEN_DIR}/qrandomgenerator_wrapper.cpp +${QtCore_GEN_DIR}/qrandomgenerator64_wrapper.cpp ${QtCore_GEN_DIR}/qreadlocker_wrapper.cpp ${QtCore_GEN_DIR}/qreadwritelock_wrapper.cpp ${QtCore_GEN_DIR}/qrect_wrapper.cpp @@ -104,6 +106,7 @@ ${QtCore_GEN_DIR}/qresource_wrapper.cpp ${QtCore_GEN_DIR}/qrunnable_wrapper.cpp ${QtCore_GEN_DIR}/qsavefile_wrapper.cpp ${QtCore_GEN_DIR}/qsemaphore_wrapper.cpp +${QtCore_GEN_DIR}/qsemaphorereleaser_wrapper.cpp ${QtCore_GEN_DIR}/qsequentialanimationgroup_wrapper.cpp ${QtCore_GEN_DIR}/qsettings_wrapper.cpp ${QtCore_GEN_DIR}/qsignalmapper_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 6db3691a6..19975b1dc 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -1785,6 +1785,7 @@ </value-type> <value-type name="QUuid"> + <enum-type name="StringFormat" since="5.11"/> <enum-type name="Variant"/> <enum-type name="Version"/> <add-function signature="__repr__" return-type="PyObject*"> @@ -1812,6 +1813,7 @@ <value-type name="QLocale"> <enum-type name="Country" /> + <enum-type name="DataSizeFormat" flags="DataSizeFormats" since="5.10"/> <enum-type name="FloatingPointPrecisionOption" since="5.7"/> <enum-type name="FormatType"/> <enum-type name="Language" /> @@ -2030,6 +2032,7 @@ </object-type> <object-type name="QAbstractItemModel"> + <enum-type name="CheckIndexOption" flags="CheckIndexOptions" class="yes" since="5.11"/> <enum-type name="LayoutChangeHint" /> <!-- This function was replaced by a added function --> <modify-function signature="createIndex(int,int,void*)const" remove="all"/> @@ -2832,6 +2835,7 @@ </object-type> <object-type name="QFileDevice" since="5.0"> <enum-type name="FileError"/> + <enum-type name="FileTime" since="5.10"/> <enum-type name="MemoryMapFlags"/> <enum-type name="Permission" flags="Permissions"/> <enum-type name="FileHandleFlag" flags="FileHandleFlags"/> @@ -2993,10 +2997,18 @@ <modify-function signature="lock()" allow-thread="yes"/> <modify-function signature="tryLock(int)" allow-thread="yes"/> </object-type> + <object-type name="QRandomGenerator" since="5.10"> + <modify-function signature="global()" rename="global_" allow-thread="yes" /> + <modify-function signature="operator()()" remove="all"/> + </object-type> + <object-type name="QRandomGenerator64" since="5.10"> + <modify-function signature="operator()()" remove="all"/> + </object-type> <object-type name="QSemaphore"> <modify-function signature="acquire(int)" allow-thread="yes"/> <modify-function signature="tryAcquire(int,int)" allow-thread="yes"/> </object-type> + <object-type name="QSemaphoreReleaser" since="5.10"/> <object-type name="QSocketNotifier"> <enum-type name="Type"/> diff --git a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt index cfca07862..030426b05 100644 --- a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt @@ -82,6 +82,11 @@ ${QtMultimedia_GEN_DIR}/qvideowindowcontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qtmultimedia_module_wrapper.cpp ) +if (Qt5Multimedia_VERSION VERSION_EQUAL 5.11.0 OR Qt5Multimedia_VERSION VERSION_GREATER 5.11.0) + list(APPEND QtMultimedia_SRC + ${QtMultimedia_GEN_DIR}/qcustomaudiorolecontrol_wrapper.cpp) +endif() + set(QtMultimedia_include_dirs ${QtMultimedia_SOURCE_DIR} ${QtMultimedia_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml index ea34e0b02..15c0729e2 100644 --- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml +++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml @@ -264,6 +264,7 @@ <value-type name="QMediaContent"/> <object-type name="QMediaGaplessPlaybackControl"/> <object-type name="QMediaControl"/> + <object-type name="QCustomAudioRoleControl" since="5.11"/> <object-type name="QMediaNetworkAccessControl"/> <!-- Causes compile errors <namespace-type name="QMediaMetaData"/> diff --git a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml index 5378d0dfa..94e6c77de 100644 --- a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml +++ b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml @@ -192,10 +192,13 @@ <modify-function signature="lookupHost(QString,QObject*,const char*)" access="private"/> </value-type> - <value-type name="QNetworkAddressEntry" /> + <value-type name="QNetworkAddressEntry"> + <enum-type name="DnsEligibilityStatus" since="5.11"/> + </value-type> <value-type name="QNetworkInterface"> <enum-type name="InterfaceFlag" flags="InterfaceFlags"/> + <enum-type name="InterfaceType" since="5.11"/> </value-type> <value-type name="QNetworkProxy"> diff --git a/sources/pyside2/PySide2/QtTest/typesystem_test.xml b/sources/pyside2/PySide2/QtTest/typesystem_test.xml index ae5e08949..6b653d924 100644 --- a/sources/pyside2/PySide2/QtTest/typesystem_test.xml +++ b/sources/pyside2/PySide2/QtTest/typesystem_test.xml @@ -57,6 +57,7 @@ <rejection class="QTest" function-name="toHexRepresentation"/> <rejection class="QTest" function-name="qWait"/> <rejection class="QTest" function-name="qFail"/> + <rejection class="QTest" function-name="qInit"/> <rejection class="QTest" function-name="qExec"/> <rejection class="QTest" function-name="qData"/> <rejection class="QTest" function-name="qWarn"/> diff --git a/sources/pyside2/doc/extras/PySide.QtHelp.rst b/sources/pyside2/doc/extras/PySide.QtHelp.rst index 5e101a795..239f4faa6 100644 --- a/sources/pyside2/doc/extras/PySide.QtHelp.rst +++ b/sources/pyside2/doc/extras/PySide.QtHelp.rst @@ -3,22 +3,3 @@ To include the definitions of the module's classes, use the following directive: :: import PySide2.QtHelp - -License Information -------------------- - -The QtHelp module uses the CLucene indexing library to provide full-text searching capabilities for Qt Assistant and applications that use the features of QtHelp. - -Qt Commercial Edition licensees that wish to distribute applications that use these features of the QtHelp module need to be aware of their obligations under the GNU Lesser General Public License (LGPL). - -Developers using the Open Source Edition can choose to redistribute the module under the appropriate version of the GNU LGPL; version 2.1 for applications and libraries licensed under the GNU GPL version 2, or version 3 for applications and libraries licensed under the GNU GPL version 3. - -Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team - -Changes are Copyright (C) 2016 The Qt Company Ltd. - -This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py index aacb7e0d9..3a678cd14 100644 --- a/sources/pyside2/pyside_version.py +++ b/sources/pyside2/pyside_version.py @@ -38,7 +38,7 @@ ############################################################################# major_version = "5" -minor_version = "9" +minor_version = "11" patch_version = "0" pre_release_version_type = "a" # e.g. "a", "b", "rc". pre_release_version = "1" # e.g "1", "2", (which means "beta1", "beta2", if type is "b") diff --git a/sources/pyside2/tests/QtCore/qabstractitemmodel_test.py b/sources/pyside2/tests/QtCore/qabstractitemmodel_test.py index 0c9da65c5..a59b5c64c 100644 --- a/sources/pyside2/tests/QtCore/qabstractitemmodel_test.py +++ b/sources/pyside2/tests/QtCore/qabstractitemmodel_test.py @@ -43,6 +43,10 @@ class TestQModelIndexInternalPointer(unittest.TestCase): m = MyModel() foo = Foo() idx = m.createIndex(0,0, foo) + check = m.checkIndex(idx, QAbstractItemModel.CheckIndexOption.IndexIsValid + | QAbstractItemModel.CheckIndexOption.DoNotUseParent + | QAbstractItemModel.CheckIndexOption.ParentIsInvalid) + self.assertTrue(check) def testPassQPersistentModelIndexAsQModelIndex(self): # Related to bug #716 diff --git a/sources/pyside2/tests/QtCore/qrandomgenerator_test.py b/sources/pyside2/tests/QtCore/qrandomgenerator_test.py new file mode 100644 index 000000000..7d80510a7 --- /dev/null +++ b/sources/pyside2/tests/QtCore/qrandomgenerator_test.py @@ -0,0 +1,49 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +import unittest + +from PySide2.QtCore import QRandomGenerator, QRandomGenerator64 + +class QRandomGeneratorTest(unittest.TestCase): + '''Test case for QRandomGenerator''' + + def testGenerator(self): + self.assertTrue(QRandomGenerator.system()) + self.assertTrue(QRandomGenerator.global_()) + generator = QRandomGenerator() + r = generator.bounded(10, 20) + self.assertTrue(r >= 10) + self.assertTrue(r <= 20) + + def testGenerator64(self): + generator = QRandomGenerator64() + r = generator.generate() + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/mac/qmacstyle_test.py b/sources/pyside2/tests/mac/qmacstyle_test.py index 47925a435..0ab9c0896 100644 --- a/sources/pyside2/tests/mac/qmacstyle_test.py +++ b/sources/pyside2/tests/mac/qmacstyle_test.py @@ -34,12 +34,14 @@ import unittest from helper import UsesQApplication -QMacStyle = type(QStyleFactory.create('Macintosh')) - class QMacStyleTest(UsesQApplication): + def setUp(self): + UsesQApplication.setUp(self) + self.QMacStyle = type(QStyleFactory.create('Macintosh')) + def testWidgetStyle(self): w = QLabel('Hello') - self.assertTrue(isinstance(w.style(), QMacStyle)) + self.assertTrue(isinstance(w.style(), self.QMacStyle)) if __name__ == '__main__': unittest.main() |