1 files changed, 28 insertions, 38 deletions

diff --git a/sources/pyside6/tests/QtQml/registertype.py b/sources/pyside6/tests/QtQml/registertype.py
index 6d8ad47eb..6c9874f32 100644
--- a/sources/pyside6/tests/QtQml/registertype.py
+++ b/sources/pyside6/tests/QtQml/registertype.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,19 +10,22 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from helper.helper import adjust_filename
+from helper.helper import quickview_errorstring
 
 from PySide6.QtCore import Property, QObject, QTimer, QUrl
 from PySide6.QtGui import QGuiApplication, QPen, QColor, QPainter
-from PySide6.QtQml import qmlRegisterType, ListProperty, QmlElement
+from PySide6.QtQml import (qjsEngine, qmlContext, qmlEngine, qmlRegisterType,
+                           ListProperty, QmlElement, QmlNamedElement)
 from PySide6.QtQuick import QQuickView, QQuickItem, QQuickPaintedItem
 
+
 QML_IMPORT_NAME = "Charts"
 QML_IMPORT_MAJOR_VERSION = 1
 
+
 @QmlElement
 class PieSlice (QQuickPaintedItem):
-    def __init__(self, parent = None):
+    def __init__(self, parent=None):
         QQuickPaintedItem.__init__(self, parent)
         self._color = QColor()
         self._fromAngle = 0
@@ -78,14 +56,15 @@ class PieSlice (QQuickPaintedItem):
     def paint(self, painter):
         global paintCalled
         pen = QPen(self._color, 2)
-        painter.setPen(pen);
-        painter.setRenderHints(QPainter.Antialiasing, True);
-        painter.drawPie(self.boundingRect(), self._fromAngle * 16, self._angleSpan * 16);
+        painter.setPen(pen)
+        painter.setRenderHints(QPainter.Antialiasing, True)
+        painter.drawPie(self.boundingRect(), self._fromAngle * 16, self._angleSpan * 16)
         paintCalled = True
 
-@QmlElement
-class PieChart (QQuickItem):
-    def __init__(self, parent = None):
+
+@QmlNamedElement("PieChart")
+class PieChartOriginalName(QQuickItem):
+    def __init__(self, parent=None):
         QQuickItem.__init__(self, parent)
         self._name = ''
         self._slices = []
@@ -106,21 +85,32 @@ class PieChart (QQuickItem):
 
     slices = ListProperty(PieSlice, append=appendSlice)
 
+
 appendCalled = False
 paintCalled = False
 
+
 class TestQmlSupport(unittest.TestCase):
 
     def testIt(self):
         app = QGuiApplication([])
 
         view = QQuickView()
-        view.setSource(QUrl.fromLocalFile(adjust_filename('registertype.qml', __file__)))
+        file = Path(__file__).resolve().parent / 'registertype.qml'
+        self.assertTrue(file.is_file())
+        view.setSource(QUrl.fromLocalFile(file))
+        root_object = view.rootObject()
+        self.assertTrue(root_object, quickview_errorstring(view))
+        self.assertTrue(qjsEngine(root_object))
+        self.assertEqual(qmlEngine(root_object), view.engine())
+        self.assertTrue(qmlContext(root_object))
+
         view.show()
         QTimer.singleShot(250, view.close)
-        app.exec_()
+        app.exec()
         self.assertTrue(appendCalled)
         self.assertTrue(paintCalled)
 
+
 if __name__ == '__main__':
     unittest.main()