diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-24 10:01:52 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-24 10:01:52 +0100 |
| commit | 491e85ef2bb7b39de39604b8e20f679c97a2981a (patch) | |
| tree | 15f84b1e68a03d8ff5f6fcaa33a17e56444c37c5 /sources/pyside2/tests/QtWidgets | |
| parent | fa709e93b80ac7d92dbf6be6d5ce807b4e487e1d (diff) | |
| parent | d579912b31d7cfa7b0b216916fbbf3eb632a9d9d (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I587b40f07da85d431d4fdb6f98259a9be0bb73e5
Diffstat (limited to 'sources/pyside2/tests/QtWidgets')
| -rw-r--r-- | sources/pyside2/tests/QtWidgets/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | sources/pyside2/tests/QtWidgets/bug_750.py | 2 | ||||
| -rw-r--r-- | sources/pyside2/tests/QtWidgets/qapplication_singleton_test.py | 39 |
3 files changed, 1 insertions, 41 deletions
diff --git a/sources/pyside2/tests/QtWidgets/CMakeLists.txt b/sources/pyside2/tests/QtWidgets/CMakeLists.txt index 6d8645918..6682136ea 100644 --- a/sources/pyside2/tests/QtWidgets/CMakeLists.txt +++ b/sources/pyside2/tests/QtWidgets/CMakeLists.txt @@ -87,7 +87,6 @@ PYSIDE_TEST(qapp_issue_585.py) PYSIDE_TEST(qapp_test.py) PYSIDE_TEST(qapplication_test.py) PYSIDE_TEST(qapplication_exit_segfault_test.py) -PYSIDE_TEST(qapplication_singleton_test.py) PYSIDE_TEST(qbrush_test.py) PYSIDE_TEST(qdynamic_signal.py) # TODO: This passes, but requires manual button clicking (at least on mac) diff --git a/sources/pyside2/tests/QtWidgets/bug_750.py b/sources/pyside2/tests/QtWidgets/bug_750.py index 42b6c9843..78d333efd 100644 --- a/sources/pyside2/tests/QtWidgets/bug_750.py +++ b/sources/pyside2/tests/QtWidgets/bug_750.py @@ -36,7 +36,7 @@ from helper.usesqapplication import UsesQApplication from PySide2.QtCore import QTimer from PySide2.QtGui import QPainter, QFont, QFontInfo -from PySide2.QtWidgets import QWidget, qApp +from PySide2.QtWidgets import QWidget class MyWidget(QWidget): def paintEvent(self, e): diff --git a/sources/pyside2/tests/QtWidgets/qapplication_singleton_test.py b/sources/pyside2/tests/QtWidgets/qapplication_singleton_test.py deleted file mode 100644 index e79e303f0..000000000 --- a/sources/pyside2/tests/QtWidgets/qapplication_singleton_test.py +++ /dev/null @@ -1,39 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the test suite of Qt for Python. -## -## $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.QtWidgets import QApplication - -class TestSingleton(unittest.TestCase): - def testBasic(self): - a = QApplication([]) - self.assertRaises(RuntimeError, QApplication, []) - -if __name__ == '__main__': - unittest.main() |