1 files changed, 10 insertions, 11 deletions
diff --git a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
index bcc7cccf50..c3527e4215 100644
--- a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
+++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 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 <QComboBox>
 #include <QDataWidgetMapper>
@@ -254,22 +254,22 @@ void tst_QDataWidgetMapper::currentIndexChanged()
     QSignalSpy spy(&mapper, &QDataWidgetMapper::currentIndexChanged);
 
     mapper.toFirst();
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(spy.takeFirst().at(0).toInt(), 0);
 
     mapper.toNext();
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(spy.takeFirst().at(0).toInt(), 1);
 
     mapper.setCurrentIndex(7);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(spy.takeFirst().at(0).toInt(), 7);
 
     mapper.setCurrentIndex(-1);
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 
     mapper.setCurrentIndex(42);
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 }
 
 void tst_QDataWidgetMapper::changingValues()
@@ -420,27 +420,26 @@ void tst_QDataWidgetMapper::textEditDoesntChangeFocusOnTab_qtbug3305()
 
     container.show();
 
-    QApplicationPrivate::setActiveWindow(&container);
     QVERIFY(QTest::qWaitForWindowActive(&container));
 
     int closeEditorSpyCount = 0;
     const QString textEditContents = textEdit->toPlainText();
 
-    QCOMPARE(closeEditorSpy.count(), closeEditorSpyCount);
+    QCOMPARE(closeEditorSpy.size(), closeEditorSpyCount);
     QVERIFY(lineEdit->hasFocus());
     QVERIFY(!textEdit->hasFocus());
 
     // this will generate a closeEditor for the tab key, and another for the focus out
     QTest::keyClick(QApplication::focusWidget(), Qt::Key_Tab);
     closeEditorSpyCount += 2;
-    QTRY_COMPARE(closeEditorSpy.count(), closeEditorSpyCount);
+    QTRY_COMPARE(closeEditorSpy.size(), closeEditorSpyCount);
 
     QTRY_VERIFY(textEdit->hasFocus());
     QVERIFY(!lineEdit->hasFocus());
 
     // now that the text edit is focused, a tab keypress will insert a tab, not change focus
     QTest::keyClick(QApplication::focusWidget(), Qt::Key_Tab);
-    QTRY_COMPARE(closeEditorSpy.count(), closeEditorSpyCount);
+    QTRY_COMPARE(closeEditorSpy.size(), closeEditorSpyCount);
 
     QVERIFY(!lineEdit->hasFocus());
     QVERIFY(textEdit->hasFocus());
@@ -451,7 +450,7 @@ void tst_QDataWidgetMapper::textEditDoesntChangeFocusOnTab_qtbug3305()
     QTRY_VERIFY(lineEdit->hasFocus());
     QVERIFY(!textEdit->hasFocus());
     ++closeEditorSpyCount;
-    QCOMPARE(closeEditorSpy.count(), closeEditorSpyCount);
+    QCOMPARE(closeEditorSpy.size(), closeEditorSpyCount);
 }
 
 QTEST_MAIN(tst_QDataWidgetMapper)