18 files changed, 47 insertions, 62 deletions
diff --git a/sources/pyside6/tests/QtCore/CMakeLists.txt b/sources/pyside6/tests/QtCore/CMakeLists.txt
index cf7e91e30..6f018babc 100644
--- a/sources/pyside6/tests/QtCore/CMakeLists.txt
+++ b/sources/pyside6/tests/QtCore/CMakeLists.txt
@@ -1,5 +1,7 @@
 PYSIDE_TEST(attr_cache_py3k.py)
 PYSIDE_TEST(bug_278_test.py)
+PYSIDE_TEST(bug_300_test.py)
+PYSIDE_TEST(bug_324.py)
 PYSIDE_TEST(bug_332.py)
 PYSIDE_TEST(bug_408.py)
 PYSIDE_TEST(bug_428.py)
@@ -26,6 +28,7 @@ PYSIDE_TEST(bug_1019.py)
 PYSIDE_TEST(bug_1063.py)
 PYSIDE_TEST(bug_1069.py)
 PYSIDE_TEST(bug_1313.py)
+PYSIDE_TEST(bug_PYSIDE-41.py)
 PYSIDE_TEST(bug_PYSIDE-42.py)
 PYSIDE_TEST(bug_PYSIDE-164.py)
 PYSIDE_TEST(blocking_signals_test.py)
diff --git a/sources/pyside6/tests/QtGui/bug_300_test.py b/sources/pyside6/tests/QtCore/bug_300_test.py
index 9a708f903..9a708f903 100644
--- a/sources/pyside6/tests/QtGui/bug_300_test.py
+++ b/sources/pyside6/tests/QtCore/bug_300_test.py
diff --git a/sources/pyside6/tests/QtWidgets/bug_324.py b/sources/pyside6/tests/QtCore/bug_324.py
index b3336923f..33fe48a52 100644
--- a/sources/pyside6/tests/QtWidgets/bug_324.py
+++ b/sources/pyside6/tests/QtCore/bug_324.py
@@ -37,8 +37,7 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6.QtCore import QObject, Signal
-from PySide6.QtWidgets import QApplication
+from PySide6.QtCore import QCoreApplication, QObject, Signal
 
 
 class QBug(QObject):
@@ -57,7 +56,7 @@ class Bug324(unittest.TestCase):
         self.value = val
 
     def testBug(self):
-        app = QApplication([])
+        app = QCoreApplication([])
         bug = QBug()
         self.value = ''
         bug.done.connect(self.on_done)
diff --git a/sources/pyside6/tests/QtGui/bug_PYSIDE-41.py b/sources/pyside6/tests/QtCore/bug_PYSIDE-41.py
index d7aea57bf..99f2496ea 100644
--- a/sources/pyside6/tests/QtGui/bug_PYSIDE-41.py
+++ b/sources/pyside6/tests/QtCore/bug_PYSIDE-41.py
@@ -26,10 +26,6 @@
 ##
 #############################################################################
 
-# TODO:
-# move this to QtCore -- QStringListModel is part of QtGui and there is no
-# simple model class appropriate for this test in QtCore.
-
 import os
 import sys
 import unittest
diff --git a/sources/pyside6/tests/QtCore/qsocketnotifier_test.py b/sources/pyside6/tests/QtCore/qsocketnotifier_test.py
index b348d5aa7..935b778d4 100644
--- a/sources/pyside6/tests/QtCore/qsocketnotifier_test.py
+++ b/sources/pyside6/tests/QtCore/qsocketnotifier_test.py
@@ -40,13 +40,12 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6.QtWidgets import QApplication
-from PySide6.QtCore import QSocketNotifier
+from PySide6.QtCore import QCoreApplication, QSocketNotifier
 
 
 class QSocketNotifierTest(unittest.TestCase):
     def testClass(self):
-        app = QApplication([])
+        app = QCoreApplication([])
         # socketpair is not available on Windows
         if os.name != "nt":
             w_sock, r_sock = socket.socketpair(socket.AF_UNIX, socket.SOCK_STREAM)
diff --git a/sources/pyside6/tests/QtGui/CMakeLists.txt b/sources/pyside6/tests/QtGui/CMakeLists.txt
index dc3056643..d652af4fc 100644
--- a/sources/pyside6/tests/QtGui/CMakeLists.txt
+++ b/sources/pyside6/tests/QtGui/CMakeLists.txt
@@ -1,8 +1,7 @@
 #Keep this in alphabetical sort
 
-PYSIDE_TEST(bug_300_test.py)
 PYSIDE_TEST(bug_367.py)
-PYSIDE_TEST(bug_480.py)
+PYSIDE_TEST(bug_493.py)
 PYSIDE_TEST(bug_606.py)
 PYSIDE_TEST(bug_617.py)
 PYSIDE_TEST(bug_652.py)
@@ -10,13 +9,15 @@ PYSIDE_TEST(bug_660.py)
 PYSIDE_TEST(bug_716.py)
 PYSIDE_TEST(bug_740.py)
 PYSIDE_TEST(bug_743.py)
+PYSIDE_TEST(bug_785.py)
 PYSIDE_TEST(bug_991.py)
 PYSIDE_TEST(bug_1091.py)
-PYSIDE_TEST(bug_PYSIDE-41.py)
 PYSIDE_TEST(bug_PYSIDE-344.py)
 PYSIDE_TEST(deepcopy_test.py)
+PYSIDE_TEST(event_filter_test.py)
 PYSIDE_TEST(float_to_int_implicit_conversion_test.py)
 PYSIDE_TEST(pyside_reload_test.py)
+PYSIDE_TEST(qbrush_test.py)
 PYSIDE_TEST(qcolor_test.py)
 PYSIDE_TEST(qcolor_reduce_test.py)
 PYSIDE_TEST(qcursor_test.py)
@@ -26,10 +27,13 @@ PYSIDE_TEST(qfont_test.py)
 PYSIDE_TEST(qfontmetrics_test.py)
 PYSIDE_TEST(qguiapplication_test.py)
 PYSIDE_TEST(qicon_test.py)
+PYSIDE_TEST(qimage_test.py)
 PYSIDE_TEST(qitemselection_test.py)
 PYSIDE_TEST(qpainter_test.py)
+PYSIDE_TEST(qpen_test.py)
 PYSIDE_TEST(qpdfwriter_test.py)
 PYSIDE_TEST(qpixelformat_test.py)
+PYSIDE_TEST(qpixmap_constructor.py)
 PYSIDE_TEST(qpixmap_test.py)
 PYSIDE_TEST(qpixmapcache_test.py)
 PYSIDE_TEST(qpolygonf_test.py)
@@ -37,6 +41,9 @@ PYSIDE_TEST(qkeysequence_test.py)
 PYSIDE_TEST(qradialgradient_test.py)
 PYSIDE_TEST(qrasterwindow_test.py)
 PYSIDE_TEST(qregion_test.py)
+PYSIDE_TEST(qshortcut_test.py)
+PYSIDE_TEST(qstandarditemmodel_test.py)
+PYSIDE_TEST(qstring_qkeysequence_test.py)
 PYSIDE_TEST(qstylehints_test.py)
 PYSIDE_TEST(qtextdocument_functions.py)
 PYSIDE_TEST(qtextdocument_undoredo_test.py)
diff --git a/sources/pyside6/tests/QtWidgets/bug_493.py b/sources/pyside6/tests/QtGui/bug_493.py
index 52aae39da..f0eabd551 100644
--- a/sources/pyside6/tests/QtWidgets/bug_493.py
+++ b/sources/pyside6/tests/QtGui/bug_493.py
@@ -36,8 +36,7 @@ from init_paths import init_test_paths
 init_test_paths(False)
 
 from PySide6.QtCore import Qt, QEvent
-from PySide6.QtGui import QKeyEvent, QKeySequence
-from PySide6.QtWidgets import QApplication
+from PySide6.QtGui import QGuiApplication, QKeyEvent, QKeySequence
 
 
 class TestBug493(unittest.TestCase):
@@ -45,7 +44,7 @@ class TestBug493(unittest.TestCase):
     def testIt(self):
         # We need a qapp otherwise Qt will crash when trying to detect the
         # current platform
-        app = QApplication([])
+        app = QGuiApplication([])
         ev1 = QKeyEvent(QEvent.KeyRelease, Qt.Key_Delete, Qt.NoModifier)
         ev2 = QKeyEvent(QEvent.KeyRelease, Qt.Key_Copy, Qt.NoModifier)
         ks = QKeySequence.Delete
diff --git a/sources/pyside6/tests/QtWidgets/bug_785.py b/sources/pyside6/tests/QtGui/bug_785.py
index 019dbc0cb..e2193c3b9 100644
--- a/sources/pyside6/tests/QtWidgets/bug_785.py
+++ b/sources/pyside6/tests/QtGui/bug_785.py
@@ -37,7 +37,6 @@ init_test_paths(False)
 
 from PySide6.QtCore import QItemSelection
 from PySide6.QtGui import QStandardItemModel, QStandardItem
-from PySide6.QtWidgets import QApplication
 
 
 class Bug324(unittest.TestCase):
diff --git a/sources/pyside6/tests/QtWidgets/event_filter_test.py b/sources/pyside6/tests/QtGui/event_filter_test.py
index 08ca8c7b3..a64386e12 100644
--- a/sources/pyside6/tests/QtWidgets/event_filter_test.py
+++ b/sources/pyside6/tests/QtGui/event_filter_test.py
@@ -35,9 +35,9 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from helper.usesqapplication import UsesQApplication
+from helper.usesqguiapplication import UsesQGuiApplication
 from PySide6.QtCore import QObject, QEvent
-from PySide6.QtWidgets import QWidget
+from PySide6.QtGui import QWindow
 
 
 class MyFilter(QObject):
@@ -47,7 +47,7 @@ class MyFilter(QObject):
         return QObject.eventFilter(self, obj, event)
 
 
-class EventFilter(UsesQApplication):
+class EventFilter(UsesQGuiApplication):
     @unittest.skipUnless(hasattr(sys, "getrefcount"), f"{sys.implementation.name} has no refcount")
     def testRefCount(self):
         o = QObject()
@@ -62,7 +62,7 @@ class EventFilter(UsesQApplication):
         self.assertEqual(sys.getrefcount(o), 2)
 
     def testObjectDestructorOrder(self):
-        w = QWidget()
+        w = QWindow()
         filt = MyFilter()
         filt.app = self.app
         w.installEventFilter(filt)
diff --git a/sources/pyside6/tests/QtWidgets/qbrush_test.py b/sources/pyside6/tests/QtGui/qbrush_test.py
index 2083a6c56..2fae5eaf2 100644
--- a/sources/pyside6/tests/QtWidgets/qbrush_test.py
+++ b/sources/pyside6/tests/QtGui/qbrush_test.py
@@ -39,12 +39,11 @@ init_test_paths(False)
 
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QColor, QBrush
-from PySide6.QtWidgets import QApplication
 
-from helper.usesqapplication import UsesQApplication
+from helper.usesqguiapplication import UsesQGuiApplication
 
 
-class Constructor(UsesQApplication):
+class Constructor(UsesQGuiApplication):
     '''Test case for constructor of QBrush'''
 
     def testQColor(self):
diff --git a/sources/pyside6/tests/QtWidgets/qimage_test.py b/sources/pyside6/tests/QtGui/qimage_test.py
index 6d15d8c3e..b2dd7304a 100644
--- a/sources/pyside6/tests/QtWidgets/qimage_test.py
+++ b/sources/pyside6/tests/QtGui/qimage_test.py
@@ -38,8 +38,7 @@ from init_paths import init_test_paths
 init_test_paths(False)
 
 from PySide6.QtGui import QImage
-from PySide6.QtWidgets import QLabel
-from helper.usesqapplication import UsesQApplication
+from helper.usesqguiapplication import UsesQGuiApplication
 
 
 xpm = [
@@ -275,7 +274,7 @@ xpm = [
 ]
 
 
-class QImageTest(UsesQApplication):
+class QImageTest(UsesQGuiApplication):
     '''Test case for calling setPixel with float as argument'''
 
     def testQImageStringBuffer(self):
@@ -302,7 +301,6 @@ class QImageTest(UsesQApplication):
         img = QImage(bytes('', "UTF-8"), 100, 100, QImage.Format_ARGB32)
 
     def testXpmConstructor(self):
-        label = QLabel()
         img = QImage(xpm)
         self.assertFalse(img.isNull())
         self.assertEqual(img.width(), 27)
diff --git a/sources/pyside6/tests/QtWidgets/qpen_test.py b/sources/pyside6/tests/QtGui/qpen_test.py
index 7ca73cca8..e8e80d78f 100644
--- a/sources/pyside6/tests/QtWidgets/qpen_test.py
+++ b/sources/pyside6/tests/QtGui/qpen_test.py
@@ -35,14 +35,13 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from helper.usesqapplication import UsesQApplication
+from helper.usesqguiapplication import UsesQGuiApplication
 
 from PySide6.QtCore import Qt, QTimer
-from PySide6.QtGui import QPen, QPainter
-from PySide6.QtWidgets import QWidget
+from PySide6.QtGui import QPen, QPainter, QRasterWindow
 
 
-class Painting(QWidget):
+class Painting(QRasterWindow):
     def __init__(self):
         super().__init__()
         self.penFromEnum = None
@@ -59,7 +58,7 @@ class Painting(QWidget):
         QTimer.singleShot(20, self.close)
 
 
-class QPenTest(UsesQApplication):
+class QPenTest(UsesQGuiApplication):
 
     def testCtorWithCreatedEnums(self):
         '''A simple case of QPen creation using created enums.'''
@@ -73,7 +72,7 @@ class QPenTest(UsesQApplication):
         '''Calls QPainter.setPen with both enum and integer. Bug #511.'''
         w = Painting()
         w.show()
-        w.setWindowTitle("qpen_test")
+        w.setTitle("qpen_test")
         self.app.exec()
         self.assertEqual(w.penFromEnum.style(), Qt.NoPen)
         self.assertEqual(w.penFromInteger.style(), Qt.SolidLine)
diff --git a/sources/pyside6/tests/QtWidgets/qpixmap_constructor.py b/sources/pyside6/tests/QtGui/qpixmap_constructor.py
index 81afc3792..32c649568 100644
--- a/sources/pyside6/tests/QtWidgets/qpixmap_constructor.py
+++ b/sources/pyside6/tests/QtGui/qpixmap_constructor.py
@@ -38,9 +38,8 @@ from init_paths import init_test_paths
 init_test_paths(False)
 
 from PySide6.QtGui import QPixmap
-from PySide6.QtWidgets import QLabel
 
-from helper.usesqapplication import UsesQApplication
+from helper.usesqguiapplication import UsesQGuiApplication
 
 xpm = [
     "27 22 206 2",
@@ -275,9 +274,8 @@ xpm = [
 ]
 
 
-class QStringSequenceTest(UsesQApplication):
+class QStringSequenceTest(UsesQGuiApplication):
     def testQPixmapConstructor(self):
-        label = QLabel()
         pixmap1 = QPixmap(xpm)
         self.assertFalse(pixmap1.isNull())
         self.assertEqual(pixmap1.width(), 27)
diff --git a/sources/pyside6/tests/QtWidgets/qshortcut_test.py b/sources/pyside6/tests/QtGui/qshortcut_test.py
index b9bed5a72..d7e2a9941 100644
--- a/sources/pyside6/tests/QtWidgets/qshortcut_test.py
+++ b/sources/pyside6/tests/QtGui/qshortcut_test.py
@@ -40,11 +40,10 @@ from init_paths import init_test_paths
 init_test_paths(False)
 
 from PySide6.QtCore import Qt, QTimer
-from PySide6.QtGui import QKeySequence, QShortcut
-from PySide6.QtWidgets import QApplication, QWidget
+from PySide6.QtGui import QGuiApplication, QKeySequence, QShortcut, QWindow
 
 
-class Foo(QWidget):
+class Foo(QWindow):
     def __init__(self):
         super().__init__()
         self.ok = False
@@ -68,7 +67,7 @@ class MyShortcut(QShortcut):
 class QAppPresence(unittest.TestCase):
 
     def testQShortcut(self):
-        self.qapp = QApplication([])
+        self.qapp = QGuiApplication([])
         f = Foo()
 
         self.sc = MyShortcut(QKeySequence(Qt.Key_Return), f, f.slot_of_foo)
diff --git a/sources/pyside6/tests/QtWidgets/qstandarditemmodel_test.py b/sources/pyside6/tests/QtGui/qstandarditemmodel_test.py
index df052544f..7382d34cf 100644
--- a/sources/pyside6/tests/QtWidgets/qstandarditemmodel_test.py
+++ b/sources/pyside6/tests/QtGui/qstandarditemmodel_test.py
@@ -36,21 +36,21 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
+from PySide6.QtCore import QObject
 from PySide6.QtGui import QStandardItemModel, QStandardItem
-from PySide6.QtWidgets import QWidget
 from shiboken6 import Shiboken
-from helper.usesqapplication import UsesQApplication
+from helper.usesqguiapplication import UsesQGuiApplication
 
 
-class QStandardItemModelTest(UsesQApplication):
+class QStandardItemModelTest(UsesQGuiApplication):
 
     def setUp(self):
         super(QStandardItemModelTest, self).setUp()
-        self.window = QWidget()
-        self.model = QStandardItemModel(0, 3, self.window)
+        self.parent = QObject()
+        self.model = QStandardItemModel(0, 3, self.parent)
 
     def tearDown(self):
-        del self.window
+        del self.parent
         del self.model
         # PYSIDE-535: Need to collect garbage in PyPy to trigger deletion
         gc.collect()
@@ -68,7 +68,7 @@ class QStandardItemModelTest(UsesQApplication):
         self.assertFalse(Shiboken.isValid(root))
 
 
-class QStandardItemModelRef(UsesQApplication):
+class QStandardItemModelRef(UsesQGuiApplication):
     @unittest.skipUnless(hasattr(sys, "getrefcount"), f"{sys.implementation.name} has no refcount")
     def testRefCount(self):
         model = QStandardItemModel(5, 5)
diff --git a/sources/pyside6/tests/QtWidgets/qstring_qkeysequence_test.py b/sources/pyside6/tests/QtGui/qstring_qkeysequence_test.py
index 85ae7b65b..d32498290 100644
--- a/sources/pyside6/tests/QtWidgets/qstring_qkeysequence_test.py
+++ b/sources/pyside6/tests/QtGui/qstring_qkeysequence_test.py
@@ -40,12 +40,12 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from helper.usesqapplication import UsesQApplication
+from helper.usesqguiapplication import UsesQGuiApplication
 
 from PySide6.QtGui import QAction, QKeySequence
 
 
-class QStringQKeySequenceTest(UsesQApplication):
+class QStringQKeySequenceTest(UsesQGuiApplication):
     '''Tests conversions of QString to and from QKeySequence.'''
 
     def testQStringFromQKeySequence(self):
diff --git a/sources/pyside6/tests/QtWidgets/CMakeLists.txt b/sources/pyside6/tests/QtWidgets/CMakeLists.txt
index 5ec056a26..8978df9a4 100644
--- a/sources/pyside6/tests/QtWidgets/CMakeLists.txt
+++ b/sources/pyside6/tests/QtWidgets/CMakeLists.txt
@@ -7,7 +7,6 @@ PYSIDE_TEST(application_test.py)
 PYSIDE_TEST(bug_172.py)
 PYSIDE_TEST(bug_243.py)
 PYSIDE_TEST(bug_307.py)
-PYSIDE_TEST(bug_324.py)
 PYSIDE_TEST(bug_338.py)
 PYSIDE_TEST(bug_389.py)
 PYSIDE_TEST(bug_400.py)
@@ -15,7 +14,7 @@ PYSIDE_TEST(bug_429.py)
 PYSIDE_TEST(bug_430.py)
 PYSIDE_TEST(bug_433.py)
 PYSIDE_TEST(bug_467.py)
-PYSIDE_TEST(bug_493.py)
+PYSIDE_TEST(bug_480.py)
 PYSIDE_TEST(bug_512.py)
 PYSIDE_TEST(bug_525.py)
 PYSIDE_TEST(bug_546.py)
@@ -43,7 +42,6 @@ PYSIDE_TEST(bug_728.py)
 PYSIDE_TEST(bug_736.py)
 PYSIDE_TEST(bug_750.py)
 PYSIDE_TEST(bug_778.py)
-PYSIDE_TEST(bug_785.py)
 PYSIDE_TEST(bug_793.py)
 PYSIDE_TEST(bug_811.py)
 PYSIDE_TEST(bug_834.py)
@@ -68,7 +66,6 @@ PYSIDE_TEST(bug_1006.py)
 PYSIDE_TEST(bug_1048.py)
 PYSIDE_TEST(bug_1077.py)
 PYSIDE_TEST(customproxywidget_test.py)
-PYSIDE_TEST(event_filter_test.py)
 PYSIDE_TEST(grandparent_method_test.py)
 PYSIDE_TEST(hashabletype_test.py)
 PYSIDE_TEST(keep_reference_test.py)
@@ -84,7 +81,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(qbrush_test.py)
 PYSIDE_TEST(qdynamic_signal.py)
 # TODO: This passes, but requires manual button clicking (at least on mac)
 #PYSIDE_TEST(qfontdialog_test.py)
@@ -94,7 +90,6 @@ PYSIDE_TEST(qgraphicsitem_isblocked_test.py)
 PYSIDE_TEST(qgraphicsobjectreimpl_test.py)
 PYSIDE_TEST(qgraphicsproxywidget_test.py)
 PYSIDE_TEST(qgraphicsscene_test.py)
-PYSIDE_TEST(qimage_test.py)
 PYSIDE_TEST(qinputdialog_get_test.py)
 PYSIDE_TEST(qkeysequenceedit_test.py)
 PYSIDE_TEST(qlabel_test.py)
@@ -107,14 +102,9 @@ PYSIDE_TEST(qmainwindow_test.py)
 PYSIDE_TEST(qmenu_test.py)
 PYSIDE_TEST(qmenuadd_test.py)
 PYSIDE_TEST(qobject_mi_test.py)
-PYSIDE_TEST(qpen_test.py)
 PYSIDE_TEST(qpicture_test.py)
-PYSIDE_TEST(qpixmap_constructor.py)
 PYSIDE_TEST(qpushbutton_test.py)
-PYSIDE_TEST(qshortcut_test.py)
 PYSIDE_TEST(qsplitter_test.py)
-PYSIDE_TEST(qstandarditemmodel_test.py)
-PYSIDE_TEST(qstring_qkeysequence_test.py)
 PYSIDE_TEST(qstyle_test.py)
 PYSIDE_TEST(qtableview_test.py)
 PYSIDE_TEST(qtabwidget_test.py)
diff --git a/sources/pyside6/tests/QtGui/bug_480.py b/sources/pyside6/tests/QtWidgets/bug_480.py
index cd3fd1d6b..cd3fd1d6b 100644
--- a/sources/pyside6/tests/QtGui/bug_480.py
+++ b/sources/pyside6/tests/QtWidgets/bug_480.py