1 files changed, 13 insertions, 3 deletions
diff --git a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
index 6351854a21..179cf2b006 100644
--- a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
+++ b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -10,12 +10,15 @@
 #include <QTimer>
 #include <QFutureSynchronizer>
 
+#include <QtTest/private/qemulationdetector_p.h>
+
 using namespace QtConcurrent;
 
 class tst_QtConcurrentRun: public QObject
 {
     Q_OBJECT
 private slots:
+    void initTestCase();
     void runLightFunction();
     void runHeavyFunction();
     void returnValue();
@@ -83,6 +86,13 @@ void heavy()
     qDebug("done function");
 }
 
+void tst_QtConcurrentRun::initTestCase()
+{
+    // proxy check for QEMU; catches slightly more though
+    if (QTestPrivate::isRunningArmOnX86())
+        QSKIP("Runs into spurious crashes on QEMU -- QTBUG-106906");
+}
+
 void tst_QtConcurrentRun::runLightFunction()
 {
     qDebug("starting function");
@@ -1383,7 +1393,7 @@ void tst_QtConcurrentRun::withPromiseAndThen()
         setFlag(syncEnd);
 
         future.waitForFinished();
-        QCOMPARE(future.results().count(), 0);
+        QCOMPARE(future.results().size(), 0);
         QVERIFY(runExecuted);
         QVERIFY(!cancelReceivedBeforeSync);
         QVERIFY(cancelReceivedAfterSync);
@@ -1403,7 +1413,7 @@ void tst_QtConcurrentRun::withPromiseAndThen()
         setFlag(syncEnd);
 
         resultFuture.waitForFinished();
-        QCOMPARE(future.results().count(), 1);
+        QCOMPARE(future.results().size(), 1);
         QCOMPARE(future.result(), 1);
         QVERIFY(runExecuted);
         QVERIFY(thenExecuted);
@@ -1426,7 +1436,7 @@ void tst_QtConcurrentRun::withPromiseAndThen()
         setFlag(syncEnd);
 
         resultFuture.waitForFinished();
-        QCOMPARE(future.results().count(), 0);
+        QCOMPARE(future.results().size(), 0);
         QVERIFY(runExecuted);
         QVERIFY(!thenExecuted);
         QVERIFY(cancelExecuted);