diff options
Diffstat (limited to 'sources/pyside6/tests/QtUiTools/bug_958.py')
-rw-r--r-- | sources/pyside6/tests/QtUiTools/bug_958.py | 48 |
1 files changed, 14 insertions, 34 deletions
diff --git a/sources/pyside6/tests/QtUiTools/bug_958.py b/sources/pyside6/tests/QtUiTools/bug_958.py index 5084a1262..2f8dfab62 100644 --- a/sources/pyside6/tests/QtUiTools/bug_958.py +++ b/sources/pyside6/tests/QtUiTools/bug_958.py @@ -1,30 +1,5 @@ -############################################################################# -## -## 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$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import os import sys @@ -35,26 +10,31 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1])) from init_paths import init_test_paths init_test_paths(False) -from PySide6 import QtWidgets, QtUiTools -from helper.helper import adjust_filename +from PySide6.QtWidgets import QMainWindow +from PySide6.QtUiTools import QUiLoader from helper.timedqapplication import TimedQApplication -class Gui_Qt(QtWidgets.QMainWindow): + +class Gui_Qt(QMainWindow): def __init__(self, parent=None): - super(Gui_Qt, self).__init__(parent) + super().__init__(parent) - lLoader = QtUiTools.QUiLoader() + lLoader = QUiLoader() # this used to cause a segfault because the old inject code used to destroy the parent layout - self._cw = lLoader.load(adjust_filename('bug_958.ui', __file__), self) + file = Path(__file__).resolve().parent / 'bug_958.ui' + assert (file.is_file()) + self._cw = lLoader.load(file, self) self.setCentralWidget(self._cw) + class BugTest(TimedQApplication): def testCase(self): lMain = Gui_Qt() lMain.show() - self.app.exec_() + self.app.exec() + if __name__ == "__main__": unittest.main() |