1 files changed, 27 insertions, 27 deletions

diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
index 4163d072e0..d5150d97b1 100644
--- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
@@ -124,7 +124,7 @@ public:
 
     operator bool() const
     {
-        if (m_timer.elapsed() && !m_spy.count())
+        if (m_timer.elapsed() && !m_spy.size())
             return true;
         m_spy.clear();
         return false;
@@ -166,11 +166,11 @@ void tst_QClipboard::testSignals()
 
     // Test the default mode signal.
     clipboard->setText(text);
-    QTRY_COMPARE(dataChangedSpy.count(), 1);
-    QCOMPARE(searchChangedSpy.count(), 0);
-    QCOMPARE(selectionChangedSpy.count(), 0);
-    QCOMPARE(changedSpy.count(), 1);
-    QCOMPARE(changedSpy.at(0).count(), 1);
+    QTRY_COMPARE(dataChangedSpy.size(), 1);
+    QCOMPARE(searchChangedSpy.size(), 0);
+    QCOMPARE(selectionChangedSpy.size(), 0);
+    QCOMPARE(changedSpy.size(), 1);
+    QCOMPARE(changedSpy.at(0).size(), 1);
     QCOMPARE(qvariant_cast<QClipboard::Mode>(changedSpy.at(0).at(0)), QClipboard::Clipboard);
 
     changedSpy.clear();
@@ -178,29 +178,29 @@ void tst_QClipboard::testSignals()
     // Test the selection mode signal.
     if (clipboard->supportsSelection()) {
         clipboard->setText(text, QClipboard::Selection);
-        QCOMPARE(selectionChangedSpy.count(), 1);
-        QCOMPARE(changedSpy.count(), 1);
-        QCOMPARE(changedSpy.at(0).count(), 1);
+        QCOMPARE(selectionChangedSpy.size(), 1);
+        QCOMPARE(changedSpy.size(), 1);
+        QCOMPARE(changedSpy.at(0).size(), 1);
         QCOMPARE(qvariant_cast<QClipboard::Mode>(changedSpy.at(0).at(0)), QClipboard::Selection);
     } else {
-        QCOMPARE(selectionChangedSpy.count(), 0);
+        QCOMPARE(selectionChangedSpy.size(), 0);
     }
-    QCOMPARE(dataChangedSpy.count(), 1);
-    QCOMPARE(searchChangedSpy.count(), 0);
+    QCOMPARE(dataChangedSpy.size(), 1);
+    QCOMPARE(searchChangedSpy.size(), 0);
 
     changedSpy.clear();
 
     // Test the search mode signal.
     if (clipboard->supportsFindBuffer()) {
         clipboard->setText(text, QClipboard::FindBuffer);
-        QCOMPARE(searchChangedSpy.count(), 1);
-        QCOMPARE(changedSpy.count(), 1);
-        QCOMPARE(changedSpy.at(0).count(), 1);
+        QCOMPARE(searchChangedSpy.size(), 1);
+        QCOMPARE(changedSpy.size(), 1);
+        QCOMPARE(changedSpy.at(0).size(), 1);
         QCOMPARE(qvariant_cast<QClipboard::Mode>(changedSpy.at(0).at(0)), QClipboard::FindBuffer);
     } else {
-        QCOMPARE(searchChangedSpy.count(), 0);
+        QCOMPARE(searchChangedSpy.size(), 0);
     }
-    QCOMPARE(dataChangedSpy.count(), 1);
+    QCOMPARE(dataChangedSpy.size(), 1);
 }
 
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(Q_OS_QNX)
@@ -340,16 +340,16 @@ void tst_QClipboard::setMimeData()
     QGuiApplication::clipboard()->clear(QClipboard::FindBuffer);
 
     if (QGuiApplication::clipboard()->supportsSelection())
-        QCOMPARE(spySelection.count(), 1);
+        QCOMPARE(spySelection.size(), 1);
     else
-        QCOMPARE(spySelection.count(), 0);
+        QCOMPARE(spySelection.size(), 0);
 
     if (QGuiApplication::clipboard()->supportsFindBuffer())
-        QCOMPARE(spyFindBuffer.count(), 1);
+        QCOMPARE(spyFindBuffer.size(), 1);
     else
-        QCOMPARE(spyFindBuffer.count(), 0);
+        QCOMPARE(spyFindBuffer.size(), 0);
 
-    QTRY_COMPARE(spyData.count(), 1);
+    QTRY_COMPARE(spyData.size(), 1);
 
     // an other crash test
     data = new QMimeData;
@@ -376,16 +376,16 @@ void tst_QClipboard::setMimeData()
         QGuiApplication::clipboard()->setMimeData(newData, QClipboard::FindBuffer);
 
     if (QGuiApplication::clipboard()->supportsSelection())
-        QCOMPARE(spySelection.count(), 1);
+        QCOMPARE(spySelection.size(), 1);
     else
-        QCOMPARE(spySelection.count(), 0);
+        QCOMPARE(spySelection.size(), 0);
 
     if (QGuiApplication::clipboard()->supportsFindBuffer())
-        QCOMPARE(spyFindBuffer.count(), 1);
+        QCOMPARE(spyFindBuffer.size(), 1);
     else
-        QCOMPARE(spyFindBuffer.count(), 0);
+        QCOMPARE(spyFindBuffer.size(), 0);
 
-    QTRY_COMPARE(spyData.count(), 1);
+    QTRY_COMPARE(spyData.size(), 1);
 }
 
 void tst_QClipboard::clearBeforeSetText()