3 files changed, 11 insertions, 5 deletions
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index 1d66101a0f..29dfbc144e 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -302,7 +302,6 @@ void QTestLog::leaveTestFunction()
     if (printAvailableTags)
         return;
 
-    QTest::IgnoreResultList::clearList(QTest::ignoreResultList);
     QTest::TestLoggers::leaveTestFunction();
 }
 
@@ -318,6 +317,11 @@ void QTestLog::printUnhandledIgnoreMessages()
     }
 }
 
+void QTestLog::clearIgnoreMessages()
+{
+    QTest::IgnoreResultList::clearList(QTest::ignoreResultList);
+}
+
 void QTestLog::addPass(const char *msg)
 {
     if (printAvailableTags)
diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h
index e45d9c9626..1fe52367ec 100644
--- a/src/testlib/qtestlog_p.h
+++ b/src/testlib/qtestlog_p.h
@@ -77,6 +77,7 @@ public:
     static void ignoreMessage(QtMsgType type, const char *msg);
     static int unhandledIgnoreMessages();
     static void printUnhandledIgnoreMessages();
+    static void clearIgnoreMessages();
 
     static void warn(const char *msg, const char *file, int line);
     static void info(const char *msg, const char *file, int line);
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index c3634eb01e..c49c7aefe3 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -132,15 +132,16 @@ void QTestResult::finishedCurrentTestData()
     if (QTest::expectFailMode)
         addFailure("QEXPECT_FAIL was called without any subsequent verification statements", 0, 0);
     clearExpectFail();
-}
 
-void QTestResult::finishedCurrentTestFunction()
-{
-    if (!QTest::failed && QTestLog::unhandledIgnoreMessages()) {
+    if (!QTest::dataFailed && QTestLog::unhandledIgnoreMessages()) {
         QTestLog::printUnhandledIgnoreMessages();
         addFailure("Not all expected messages were received", 0, 0);
     }
+    QTestLog::clearIgnoreMessages();
+}
 
+void QTestResult::finishedCurrentTestFunction()
+{
     if (!QTest::failed && !QTest::skipCurrentTest) {
         QTestLog::addPass("");
     }