diff options
Diffstat (limited to 'sources')
5 files changed, 68 insertions, 3 deletions
diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt index dd2e212b0..f2770f802 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 0ff1c681a..fc2fc3013 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -1814,6 +1814,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" /> @@ -2837,6 +2838,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"/> @@ -2998,10 +3000,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/QtTest/typesystem_test.xml b/sources/pyside2/PySide2/QtTest/typesystem_test.xml index c976704b8..da26370a1 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/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() |