4 files changed, 6 insertions, 12 deletions
diff --git a/src/testlib/qabstracttestlogger.cpp b/src/testlib/qabstracttestlogger.cpp
index d329386745..08fdade90b 100644
--- a/src/testlib/qabstracttestlogger.cpp
+++ b/src/testlib/qabstracttestlogger.cpp
@@ -351,8 +351,7 @@ void QAbstractTestLogger::addMessage(QtMsgType type, const QMessageLogContext &c
         case QtWarningMsg: return QAbstractTestLogger::QWarning;
         case QtFatalMsg: return QAbstractTestLogger::QFatal;
         }
-        Q_UNREACHABLE();
-        return QAbstractTestLogger::QFatal;
+        Q_UNREACHABLE_RETURN(QAbstractTestLogger::QFatal);
     }();
 
     QString formattedMessage = qFormatLogMessage(type, context, message);
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp
index 75443c96dc..dd5282cdb1 100644
--- a/src/testlib/qplaintestlogger.cpp
+++ b/src/testlib/qplaintestlogger.cpp
@@ -62,8 +62,7 @@ namespace QTest {
         case QAbstractTestLogger::BlacklistedXFail:
             return "BXFAIL ";
         }
-        Q_UNREACHABLE();
-        return nullptr;
+        Q_UNREACHABLE_RETURN(nullptr);
     }
 
     static const char *benchmarkResult2String()
@@ -89,8 +88,7 @@ namespace QTest {
         case QAbstractTestLogger::Warn:
             return "WARNING";
         }
-        Q_UNREACHABLE();
-        return nullptr;
+        Q_UNREACHABLE_RETURN(nullptr);
     }
 
     template <typename T>
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index d3858267bc..cd8b6edeb7 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1230,8 +1230,7 @@ class WatchDog : public QThread
             waitCondition.wait(m, expectationChanged);
             return true;
         }
-        Q_UNREACHABLE();
-        return false;
+        Q_UNREACHABLE_RETURN(false);
     }
 
 public:
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index 556cafd4d4..00799a02da 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -599,8 +599,7 @@ static const char *macroNameForOp(QTest::ComparisonOperation op)
     case ComparisonOperation::GreaterThanOrEqual:
         return "QCOMPARE_GE";
     }
-    Q_UNREACHABLE();
-    return "";
+    Q_UNREACHABLE_RETURN("");
 }
 
 static const char *failureMessageForOp(QTest::ComparisonOperation op)
@@ -622,8 +621,7 @@ static const char *failureMessageForOp(QTest::ComparisonOperation op)
     case ComparisonOperation::GreaterThanOrEqual:
         return "Left value is expected to be greater than or equal to right value, but is not";
     }
-    Q_UNREACHABLE();
-    return "";
+    Q_UNREACHABLE_RETURN("");
 }
 
 bool QTestResult::reportResult(bool success, qxp::function_ref<const char *()> lhs,