1 files changed, 21 insertions, 24 deletions

diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
index a0a2452ae6..3ff748ef27 100644
--- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
+++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2020 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QTest>
@@ -122,7 +122,6 @@ void tst_QButtonGroup::arrowKeyNavigation()
     layout.addWidget(&g2);
 
     dlg.show();
-    QApplicationPrivate::setActiveWindow(&dlg);
     QVERIFY(QTest::qWaitForWindowActive(&dlg));
 
     bt1.setFocus();
@@ -204,7 +203,6 @@ void tst_QButtonGroup::keyNavigationPushButtons()
     buttonGroup->addButton(pb3);
 
     dlg.show();
-    QApplicationPrivate::setActiveWindow(&dlg);
     if (!QTest::qWaitForWindowActive(&dlg))
         QSKIP("Window activation failed, skipping test");
 
@@ -351,17 +349,17 @@ void tst_QButtonGroup::testSignals()
     pb1.animateClick();
     QTestEventLoop::instance().enterLoop(1);
 
-    QCOMPARE(clickedSpy.count(), 1);
-    QCOMPARE(clickedIdSpy.count(), 1);
+    QCOMPARE(clickedSpy.size(), 1);
+    QCOMPARE(clickedIdSpy.size(), 1);
 
     int expectedId = -2;
 
     QCOMPARE(clickedIdSpy.takeFirst().at(0).toInt(), expectedId);
-    QCOMPARE(pressedSpy.count(), 1);
-    QCOMPARE(pressedIdSpy.count(), 1);
+    QCOMPARE(pressedSpy.size(), 1);
+    QCOMPARE(pressedIdSpy.size(), 1);
     QCOMPARE(pressedIdSpy.takeFirst().at(0).toInt(), expectedId);
-    QCOMPARE(releasedSpy.count(), 1);
-    QCOMPARE(releasedIdSpy.count(), 1);
+    QCOMPARE(releasedSpy.size(), 1);
+    QCOMPARE(releasedIdSpy.size(), 1);
     QCOMPARE(releasedIdSpy.takeFirst().at(0).toInt(), expectedId);
 
     clickedSpy.clear();
@@ -374,14 +372,14 @@ void tst_QButtonGroup::testSignals()
     pb2.animateClick();
     QTestEventLoop::instance().enterLoop(1);
 
-    QCOMPARE(clickedSpy.count(), 1);
-    QCOMPARE(clickedIdSpy.count(), 1);
+    QCOMPARE(clickedSpy.size(), 1);
+    QCOMPARE(clickedIdSpy.size(), 1);
     QCOMPARE(clickedIdSpy.takeFirst().at(0).toInt(), 23);
-    QCOMPARE(pressedSpy.count(), 1);
-    QCOMPARE(pressedIdSpy.count(), 1);
+    QCOMPARE(pressedSpy.size(), 1);
+    QCOMPARE(pressedIdSpy.size(), 1);
     QCOMPARE(pressedIdSpy.takeFirst().at(0).toInt(), 23);
-    QCOMPARE(releasedSpy.count(), 1);
-    QCOMPARE(releasedIdSpy.count(), 1);
+    QCOMPARE(releasedSpy.size(), 1);
+    QCOMPARE(releasedIdSpy.size(), 1);
     QCOMPARE(releasedIdSpy.takeFirst().at(0).toInt(), 23);
 
 
@@ -391,18 +389,18 @@ void tst_QButtonGroup::testSignals()
     pb1.setCheckable(true);
     pb2.setCheckable(true);
     pb1.toggle();
-    QCOMPARE(toggledSpy.count(), 1);
-    QCOMPARE(toggledIdSpy.count(), 1);
+    QCOMPARE(toggledSpy.size(), 1);
+    QCOMPARE(toggledIdSpy.size(), 1);
 
     pb2.toggle();
-    QCOMPARE(toggledSpy.count(), 3);     // equals 3 since pb1 and pb2 are both toggled
-    QCOMPARE(toggledIdSpy.count(), 3);
+    QCOMPARE(toggledSpy.size(), 3);     // equals 3 since pb1 and pb2 are both toggled
+    QCOMPARE(toggledIdSpy.size(), 3);
 
     pb1.setCheckable(false);
     pb2.setCheckable(false);
     pb1.toggle();
-    QCOMPARE(toggledSpy.count(), 3);
-    QCOMPARE(toggledIdSpy.count(), 3);
+    QCOMPARE(toggledSpy.size(), 3);
+    QCOMPARE(toggledIdSpy.size(), 3);
 }
 
 void tst_QButtonGroup::task106609()
@@ -435,14 +433,13 @@ void tst_QButtonGroup::task106609()
     qRegisterMetaType<QAbstractButton*>("QAbstractButton*");
     QSignalSpy spy1(buttons, SIGNAL(buttonClicked(QAbstractButton*)));
 
-    QApplicationPrivate::setActiveWindow(&dlg);
     QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget*>(&dlg));
 
     radio1->setFocus();
     radio1->setChecked(true);
     QTestEventLoop::instance().enterLoop(1);
 
-    QCOMPARE(spy1.count(), 2);
+    QCOMPARE(spy1.size(), 2);
 }
 
 void tst_QButtonGroup::checkedButton()
@@ -527,7 +524,7 @@ void tst_QButtonGroup::task209485_removeFromGroupInEventHandler()
     // NOTE: Reintroducing the bug of this task will cause the following line to crash:
     QTest::mouseClick(button, Qt::LeftButton);
 
-    QCOMPARE(spy1.count(), signalCount);
+    QCOMPARE(spy1.size(), signalCount);
 }
 
 void tst_QButtonGroup::autoIncrementId()