2 files changed, 21 insertions, 4 deletions
diff --git a/src/corelib/kernel/qtestsupport_core.cpp b/src/corelib/kernel/qtestsupport_core.cpp
index 02dd5ad04d..f5b6ed18cd 100644
--- a/src/corelib/kernel/qtestsupport_core.cpp
+++ b/src/corelib/kernel/qtestsupport_core.cpp
@@ -105,5 +105,25 @@ Q_CORE_EXPORT void QTest::qSleep(int ms)
 
     \sa QTest::qSleep(), QSignalSpy::wait()
 */
+Q_CORE_EXPORT void QTest::qWait(int ms)
+{
+    // Ideally this method would be implemented in terms of qWaitFor, with
+    // a predicate that always returns false, but due to a compiler bug in
+    // GCC 6 we can't do that.
+
+    Q_ASSERT(QCoreApplication::instance());
+
+    QDeadlineTimer timer(ms, Qt::PreciseTimer);
+    int remaining = ms;
+    do {
+        QCoreApplication::processEvents(QEventLoop::AllEvents, remaining);
+        QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
+        remaining = timer.remainingTime();
+        if (remaining <= 0)
+            break;
+        QTest::qSleep(qMin(10, remaining));
+        remaining = timer.remainingTime();
+    } while (remaining > 0);
+}
 
 QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qtestsupport_core.h b/src/corelib/kernel/qtestsupport_core.h
index 2abe70bf99..01b3fda7d9 100644
--- a/src/corelib/kernel/qtestsupport_core.h
+++ b/src/corelib/kernel/qtestsupport_core.h
@@ -88,10 +88,7 @@ Q_REQUIRED_RESULT static bool qWaitFor(Functor predicate, int timeout = 5000)
     return predicate(); // Last chance
 }
 
-inline void qWait(int ms)
-{
-    (void)qWaitFor([]() { return false; }, ms);
-}
+Q_CORE_EXPORT void qWait(int ms);
 
 } // namespace QTest