Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13

1 files changed, 10 insertions, 3 deletions

diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index 88e3407c90..a7a4807e06 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -218,17 +218,24 @@ static bool checkStatement(bool statement, const char *msg, const char *file, in
 {
     if (statement) {
         if (QTest::expectFailMode) {
-            QTestLog::addXPass(msg, file, line);
+            if (QTest::blacklistCurrentTest)
+                QTestLog::addBXPass(msg, file, line);
+            else
+                QTestLog::addXPass(msg, file, line);
+
+            QTest::failed = true;
             bool doContinue = (QTest::expectFailMode == QTest::Continue);
             clearExpectFail();
-            QTest::failed = true;
             return doContinue;
         }
         return true;
     }
 
     if (QTest::expectFailMode) {
-        QTestLog::addXFail(QTest::expectFailComment, file, line);
+        if (QTest::blacklistCurrentTest)
+            QTestLog::addBXFail(QTest::expectFailComment, file, line);
+        else
+            QTestLog::addXFail(QTest::expectFailComment, file, line);
         bool doContinue = (QTest::expectFailMode == QTest::Continue);
         clearExpectFail();
         return doContinue;