[QCOMPARE_3WAY] Expected and actual vars should use different formatters

- Split the orderFormatter into two parameters: actualOrderFormatter
and expectedOrderFormatter

Ammends 454f010e58b4f17df5d2683233e92448097d2dd1

Change-Id: I4ec468a0c0a4daea41c5ba2ce5ccfff0378460b8
Reviewed-by: Marc Mutz <[email protected]>
Reviewed-by: Ivan Solovev <[email protected]>

10 files changed, 118 insertions, 111 deletions

diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 8431a9daeef..4caa4dab6a7 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -2859,7 +2859,7 @@ bool QTest::compare_helper(bool success, const char *failureMsg,
     in the output, with the expected comparison expression
     \a expectedExpression. Their respective values are supplied by
     \a actualOrderPtr and \a expectedOrderPtr pointers, which are
-    formatted by \a orderFormatter.
+    formatted by \a actualOrderFormatter and \a expectedOrderFormatter.
 
     If \a failureMsg is \nullptr a default is used. If a formatter
     function returns \a nullptr, the text \c{"<null>"} is used.
@@ -2869,7 +2869,8 @@ bool QTest::compare_3way_helper(bool success, const char *failureMsg,
                                 const char *(*lhsFormatter)(const void*),
                                 const char *(*rhsFormatter)(const void*),
                                 const char *lhsExpression, const char *rhsExpression,
-                                const char *(*orderFormatter)(const void*),
+                                const char *(*actualOrderFormatter)(const void *),
+                                const char *(*expectedOrderFormatter)(const void *),
                                 const void *actualOrderPtr, const void *expectedOrderPtr,
                                 const char *expectedExpression,
                                 const char *file, int line)
@@ -2878,7 +2879,8 @@ bool QTest::compare_3way_helper(bool success, const char *failureMsg,
                                          lhsPtr, rhsPtr,
                                          lhsFormatter, rhsFormatter,
                                          lhsExpression, rhsExpression,
-                                         orderFormatter,
+                                         actualOrderFormatter,
+                                         expectedOrderFormatter,
                                          actualOrderPtr, expectedOrderPtr,
                                          expectedExpression,
                                          file, line);
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index 033b2668252..a4ff2a32b0e 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -520,7 +520,8 @@ namespace QTest
                                               const char *(*lhsFormatter)(const void*),
                                               const char *(*rhsFormatter)(const void*),
                                               const char *lhsStr, const char *rhsStr,
-                                              const char *(*orderFormatter)(const void *),
+                                              const char *(*actualOrderFormatter)(const void *),
+                                              const char *(*expectedOrderFormatter)(const void *),
                                               const void *actualOrderPtr,
                                               const void *expectedOrderPtr,
                                               const char *expectedExpression,
@@ -815,8 +816,10 @@ namespace QTest
                                    std::addressof(lhs), std::addressof(rhs),
                                    genericToString<DLHS>, genericToString<DRHS>,
                                    lhsExpression, rhsExpression,
+                                   genericToString<decltype(comparisonResult)>,
                                    genericToString<OrderingType>,
-                                   std::addressof(actualOrder), std::addressof(order),
+                                   std::addressof(comparisonResult),
+                                   std::addressof(order),
                                    resultExpression, file, line);
     }
 #else
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index 0ad7eee8f25..b770b5a1f26 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -732,7 +732,8 @@ bool QTestResult::report3WayResult(bool success,
                                    const char *(*lhsFormatter)(const void*),
                                    const char *(*rhsFormatter)(const void*),
                                    const char *lhsExpression, const char *rhsExpression,
-                                   const char *(*orderFormatter)(const void*),
+                                   const char *(*actualOrderFormatter)(const void *),
+                                   const char *(*expectedOrderFormatter)(const void *),
                                    const void *actualOrder, const void *expectedOrder,
                                    const char *expectedExpression,
                                    const char *file, int line)
@@ -762,8 +763,8 @@ bool QTestResult::report3WayResult(bool success,
     const std::unique_ptr<const char[]> lhsStr{lhsFormatter(lhs)};
     const std::unique_ptr<const char[]> rhsStr{rhsFormatter(rhs)};
 
-    const std::unique_ptr<const char[]> actual{orderFormatter(actualOrder)};
-    const std::unique_ptr<const char[]> expected{orderFormatter(expectedOrder)};
+    const std::unique_ptr<const char[]> actual{actualOrderFormatter(actualOrder)};
+    const std::unique_ptr<const char[]> expected{expectedOrderFormatter(expectedOrder)};
 
     if (!failureMessage)
         failureMessage = failureMessageForOp(QTest::ComparisonOperation::ThreeWayCompare);
diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h
index 5233644c855..22d8c322954 100644
--- a/src/testlib/qtestresult_p.h
+++ b/src/testlib/qtestresult_p.h
@@ -114,7 +114,8 @@ public:
                                  const char *(*lhsFormatter)(const void *),
                                  const char *(*rhsFormatter)(const void *),
                                  const char *lhsExpression, const char *rhsExpression,
-                                 const char *(*orderFormatter)(const void *),
+                                 const char *(*actualOrderFormatter)(const void *),
+                                 const char *(*expectedOrderFormatter)(const void *),
                                  const void *actualOrder, const void *expectedOrder,
                                  const char *expectedExpression,
                                  const char *file, int line);
diff --git a/tests/auto/testlib/selftests/expected_threewaycompare.junitxml b/tests/auto/testlib/selftests/expected_threewaycompare.junitxml
index e54a88f1f35..e10872ef1ba 100644
--- a/tests/auto/testlib/selftests/expected_threewaycompare.junitxml
+++ b/tests/auto/testlib/selftests/expected_threewaycompare.junitxml
@@ -11,7 +11,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): 1
    Right    (rhs): 2
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal]]>
     </failure>
   </testcase>
@@ -19,7 +19,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): 2
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal]]>
     </failure>
   </testcase>
@@ -27,7 +27,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): 1
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::equivalent
+   Actual   (lhs <=> rhs)  : std::partial_ordering::equivalent
    Expected (expectedOrder): Qt::partial_ordering::less]]>
     </failure>
   </testcase>
@@ -36,7 +36,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): 1.1
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::greater
+   Actual   (lhs <=> rhs)  : std::partial_ordering::greater
    Expected (expectedOrder): Qt::partial_ordering::less]]>
     </failure>
   </testcase>
@@ -44,7 +44,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): 0
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::equivalent
+   Actual   (lhs <=> rhs)  : std::partial_ordering::equivalent
    Expected (expectedOrder): Qt::partial_ordering::greater]]>
     </failure>
   </testcase>
@@ -52,7 +52,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): 0
    Right    (rhs): 0.1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::less
+   Actual   (lhs <=> rhs)  : std::partial_ordering::less
    Expected (expectedOrder): Qt::partial_ordering::greater]]>
     </failure>
   </testcase>
@@ -62,7 +62,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): 1
    Right    (rhs): 2
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal]]>
     </failure>
   </testcase>
@@ -70,7 +70,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): 2
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal]]>
     </failure>
   </testcase>
@@ -79,7 +79,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): "nullptr"
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal]]>
     </failure>
   </testcase>
@@ -87,7 +87,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): 1
    Right    (rhs): "nullptr"
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal]]>
     </failure>
   </testcase>
@@ -95,7 +95,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): 0
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::less]]>
     </failure>
   </testcase>
@@ -104,7 +104,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): 1
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::less]]>
     </failure>
   </testcase>
@@ -112,7 +112,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): Monday
    Right    (rhs): Monday
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::greater]]>
     </failure>
   </testcase>
@@ -120,7 +120,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): Monday
    Right    (rhs): Sunday
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::greater]]>
     </failure>
   </testcase>
@@ -129,7 +129,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): MyClass(1)
    Right    (rhs): MyClass(1)
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::less]]>
     </failure>
   </testcase>
@@ -138,7 +138,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (lhs): MyClass(2)
    Right    (rhs): MyClass(1)
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::less]]>
     </failure>
   </testcase>
@@ -290,7 +290,7 @@
     <failure type="fail" message="The result of operator&lt;=&gt;() is not what was expected">
       <![CDATA[   Left     (june)     : 2012/06/20 14:33:02.500[CEST]
    Right    (juneLater): 2012/06/20 14:33:02.501[CEST]
-   Actual   (june <=> juneLater)        : Qt::weak_ordering::less
+   Actual   (june <=> juneLater)        : std::weak_ordering::less
    Expected (Qt::weak_ordering::greater): Qt::weak_ordering::greater]]>
     </failure>
   </testcase>
diff --git a/tests/auto/testlib/selftests/expected_threewaycompare.lightxml b/tests/auto/testlib/selftests/expected_threewaycompare.lightxml
index 0c3a45bd645..75679c5e374 100644
--- a/tests/auto/testlib/selftests/expected_threewaycompare.lightxml
+++ b/tests/auto/testlib/selftests/expected_threewaycompare.lightxml
@@ -16,7 +16,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 2
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp" line="0">
@@ -24,7 +24,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 2
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal]]></Description>
     </Incident>
     <Duration msecs="0"/>
@@ -35,7 +35,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::equivalent
+   Actual   (lhs <=> rhs)  : std::partial_ordering::equivalent
    Expected (expectedOrder): Qt::partial_ordering::less]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
@@ -46,7 +46,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 1.1
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::greater
+   Actual   (lhs <=> rhs)  : std::partial_ordering::greater
    Expected (expectedOrder): Qt::partial_ordering::less]]></Description>
     </Incident>
     <Duration msecs="0"/>
@@ -57,7 +57,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 0
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::equivalent
+   Actual   (lhs <=> rhs)  : std::partial_ordering::equivalent
    Expected (expectedOrder): Qt::partial_ordering::greater]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp" line="0">
@@ -65,7 +65,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 0
    Right    (rhs): 0.1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::less
+   Actual   (lhs <=> rhs)  : std::partial_ordering::less
    Expected (expectedOrder): Qt::partial_ordering::greater]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
@@ -82,7 +82,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 2
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp" line="0">
@@ -90,7 +90,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 2
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal]]></Description>
     </Incident>
     <Duration msecs="0"/>
@@ -104,7 +104,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): "nullptr"
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp" line="0">
@@ -112,7 +112,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): "nullptr"
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal]]></Description>
     </Incident>
     <Duration msecs="0"/>
@@ -123,7 +123,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 0
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::less]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
@@ -134,7 +134,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::less]]></Description>
     </Incident>
     <Duration msecs="0"/>
@@ -145,7 +145,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): Monday
    Right    (rhs): Monday
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::greater]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp" line="0">
@@ -153,7 +153,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): Monday
    Right    (rhs): Sunday
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::greater]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
@@ -167,7 +167,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): MyClass(1)
    Right    (rhs): MyClass(1)
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::less]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
@@ -178,7 +178,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): MyClass(2)
    Right    (rhs): MyClass(1)
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::less]]></Description>
     </Incident>
     <Duration msecs="0"/>
@@ -374,7 +374,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (june)     : 2012/06/20 14:33:02.500[CEST]
    Right    (juneLater): 2012/06/20 14:33:02.501[CEST]
-   Actual   (june <=> juneLater)        : Qt::weak_ordering::less
+   Actual   (june <=> juneLater)        : std::weak_ordering::less
    Expected (Qt::weak_ordering::greater): Qt::weak_ordering::greater]]></Description>
     </Incident>
     <Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_threewaycompare.tap b/tests/auto/testlib/selftests/expected_threewaycompare.tap
index d05bbe8bd16..daeae42c06f 100644
--- a/tests/auto/testlib/selftests/expected_threewaycompare.tap
+++ b/tests/auto/testlib/selftests/expected_threewaycompare.tap
@@ -7,7 +7,7 @@ not ok 3 - compareInts(Qt::strong_ordering::less)
   # The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 2
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal
   at: tst_ThreeWayCompare::compareInts() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -18,7 +18,7 @@ not ok 4 - compareInts(Qt::strong_ordering::greater)
   # The result of operator<=>() is not what was expected
    Left     (lhs): 2
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal
   at: tst_ThreeWayCompare::compareInts() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -29,7 +29,7 @@ not ok 5 - compareFloats(Qt::partial_ordering::equivalent)
   # The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::equivalent
+   Actual   (lhs <=> rhs)  : std::partial_ordering::equivalent
    Expected (expectedOrder): Qt::partial_ordering::less
   at: tst_ThreeWayCompare::compareFloats() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -41,7 +41,7 @@ not ok 7 - compareFloats(Qt::partial_ordering::greater)
   # The result of operator<=>() is not what was expected
    Left     (lhs): 1.1
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::greater
+   Actual   (lhs <=> rhs)  : std::partial_ordering::greater
    Expected (expectedOrder): Qt::partial_ordering::less
   at: tst_ThreeWayCompare::compareFloats() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -52,7 +52,7 @@ not ok 8 - compareDoubles(Qt::partial_ordering::equivalent)
   # The result of operator<=>() is not what was expected
    Left     (lhs): 0
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::equivalent
+   Actual   (lhs <=> rhs)  : std::partial_ordering::equivalent
    Expected (expectedOrder): Qt::partial_ordering::greater
   at: tst_ThreeWayCompare::compareDoubles() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -63,7 +63,7 @@ not ok 9 - compareDoubles(Qt::partial_ordering::less)
   # The result of operator<=>() is not what was expected
    Left     (lhs): 0
    Right    (rhs): 0.1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::less
+   Actual   (lhs <=> rhs)  : std::partial_ordering::less
    Expected (expectedOrder): Qt::partial_ordering::greater
   at: tst_ThreeWayCompare::compareDoubles() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -76,7 +76,7 @@ not ok 12 - comparePointers(Qt::strong_ordering::less)
   # The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 2
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal
   at: tst_ThreeWayCompare::comparePointers() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -87,7 +87,7 @@ not ok 13 - comparePointers(Qt::strong_ordering::greater)
   # The result of operator<=>() is not what was expected
    Left     (lhs): 2
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal
   at: tst_ThreeWayCompare::comparePointers() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -99,7 +99,7 @@ not ok 15 - compareToNullptr(Qt::strong_ordering::less)
   # The result of operator<=>() is not what was expected
    Left     (lhs): "nullptr"
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal
   at: tst_ThreeWayCompare::compareToNullptr() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -110,7 +110,7 @@ not ok 16 - compareToNullptr(Qt::strong_ordering::greater)
   # The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): "nullptr"
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal
   at: tst_ThreeWayCompare::compareToNullptr() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -121,7 +121,7 @@ not ok 17 - compareUnregisteredEnum(Qt::strong_ordering::equivalent)
   # The result of operator<=>() is not what was expected
    Left     (lhs): 0
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::less
   at: tst_ThreeWayCompare::compareUnregisteredEnum() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -133,7 +133,7 @@ not ok 19 - compareUnregisteredEnum(Qt::strong_ordering::greater)
   # The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::less
   at: tst_ThreeWayCompare::compareUnregisteredEnum() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -144,7 +144,7 @@ not ok 20 - compareRegisteredEnum(Qt::strong_ordering::equivalent)
   # The result of operator<=>() is not what was expected
    Left     (lhs): Monday
    Right    (rhs): Monday
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::greater
   at: tst_ThreeWayCompare::compareRegisteredEnum() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -155,7 +155,7 @@ not ok 21 - compareRegisteredEnum(Qt::strong_ordering::less)
   # The result of operator<=>() is not what was expected
    Left     (lhs): Monday
    Right    (rhs): Sunday
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::greater
   at: tst_ThreeWayCompare::compareRegisteredEnum() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -167,7 +167,7 @@ not ok 23 - compareCustomTypes(Qt::strong_ordering::equivalent)
   # The result of operator<=>() is not what was expected
    Left     (lhs): MyClass(1)
    Right    (rhs): MyClass(1)
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::less
   at: tst_ThreeWayCompare::compareCustomTypes() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -179,7 +179,7 @@ not ok 25 - compareCustomTypes(Qt::strong_ordering::greater)
   # The result of operator<=>() is not what was expected
    Left     (lhs): MyClass(2)
    Right    (rhs): MyClass(1)
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::less
   at: tst_ThreeWayCompare::compareCustomTypes() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
@@ -385,7 +385,7 @@ not ok 51 - checkWeakComparison()
   # The result of operator<=>() is not what was expected
    Left     (june)     : 2012/06/20 14:33:02.500[CEST]
    Right    (juneLater): 2012/06/20 14:33:02.501[CEST]
-   Actual   (june <=> juneLater)        : Qt::weak_ordering::less
+   Actual   (june <=> juneLater)        : std::weak_ordering::less
    Expected (Qt::weak_ordering::greater): Qt::weak_ordering::greater
   at: tst_ThreeWayCompare::checkWeakComparison() (qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp
diff --git a/tests/auto/testlib/selftests/expected_threewaycompare.teamcity b/tests/auto/testlib/selftests/expected_threewaycompare.teamcity
index 07c815fa008..2eed5bdb422 100644
--- a/tests/auto/testlib/selftests/expected_threewaycompare.teamcity
+++ b/tests/auto/testlib/selftests/expected_threewaycompare.teamcity
@@ -4,66 +4,66 @@
 ##teamcity[testStarted name='compareInts(Qt::strong_ordering::equivalent)' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareInts(Qt::strong_ordering::equivalent)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareInts(Qt::strong_ordering::less)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='compareInts(Qt::strong_ordering::less)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 1|n Right (rhs): 2|n Actual (lhs <=> rhs) : Qt::strong_ordering::less|n Expected (expectedOrder): Qt::strong_ordering::equal' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='compareInts(Qt::strong_ordering::less)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 1|n Right (rhs): 2|n Actual (lhs <=> rhs) : std::strong_ordering::less|n Expected (expectedOrder): Qt::strong_ordering::equal' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareInts(Qt::strong_ordering::less)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareInts(Qt::strong_ordering::greater)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='compareInts(Qt::strong_ordering::greater)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 2|n Right (rhs): 1|n Actual (lhs <=> rhs) : Qt::strong_ordering::greater|n Expected (expectedOrder): Qt::strong_ordering::equal' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='compareInts(Qt::strong_ordering::greater)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 2|n Right (rhs): 1|n Actual (lhs <=> rhs) : std::strong_ordering::greater|n Expected (expectedOrder): Qt::strong_ordering::equal' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareInts(Qt::strong_ordering::greater)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareFloats(Qt::partial_ordering::equivalent)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='compareFloats(Qt::partial_ordering::equivalent)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 1|n Right (rhs): 1|n Actual (lhs <=> rhs) : Qt::partial_ordering::equivalent|n Expected (expectedOrder): Qt::partial_ordering::less' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='compareFloats(Qt::partial_ordering::equivalent)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 1|n Right (rhs): 1|n Actual (lhs <=> rhs) : std::partial_ordering::equivalent|n Expected (expectedOrder): Qt::partial_ordering::less' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareFloats(Qt::partial_ordering::equivalent)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareFloats(Qt::partial_ordering::less)' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareFloats(Qt::partial_ordering::less)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareFloats(Qt::partial_ordering::greater)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='compareFloats(Qt::partial_ordering::greater)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 1.1|n Right (rhs): 1|n Actual (lhs <=> rhs) : Qt::partial_ordering::greater|n Expected (expectedOrder): Qt::partial_ordering::less' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='compareFloats(Qt::partial_ordering::greater)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 1.1|n Right (rhs): 1|n Actual (lhs <=> rhs) : std::partial_ordering::greater|n Expected (expectedOrder): Qt::partial_ordering::less' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareFloats(Qt::partial_ordering::greater)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareDoubles(Qt::partial_ordering::equivalent)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='compareDoubles(Qt::partial_ordering::equivalent)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 0|n Right (rhs): 0|n Actual (lhs <=> rhs) : Qt::partial_ordering::equivalent|n Expected (expectedOrder): Qt::partial_ordering::greater' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='compareDoubles(Qt::partial_ordering::equivalent)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 0|n Right (rhs): 0|n Actual (lhs <=> rhs) : std::partial_ordering::equivalent|n Expected (expectedOrder): Qt::partial_ordering::greater' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareDoubles(Qt::partial_ordering::equivalent)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareDoubles(Qt::partial_ordering::less)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='compareDoubles(Qt::partial_ordering::less)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 0|n Right (rhs): 0.1|n Actual (lhs <=> rhs) : Qt::partial_ordering::less|n Expected (expectedOrder): Qt::partial_ordering::greater' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='compareDoubles(Qt::partial_ordering::less)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 0|n Right (rhs): 0.1|n Actual (lhs <=> rhs) : std::partial_ordering::less|n Expected (expectedOrder): Qt::partial_ordering::greater' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareDoubles(Qt::partial_ordering::less)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareDoubles(Qt::partial_ordering::greater)' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareDoubles(Qt::partial_ordering::greater)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='comparePointers(Qt::strong_ordering::equivalent)' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='comparePointers(Qt::strong_ordering::equivalent)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='comparePointers(Qt::strong_ordering::less)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='comparePointers(Qt::strong_ordering::less)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 1|n Right (rhs): 2|n Actual (lhs <=> rhs) : Qt::strong_ordering::less|n Expected (expectedOrder): Qt::strong_ordering::equal' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='comparePointers(Qt::strong_ordering::less)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 1|n Right (rhs): 2|n Actual (lhs <=> rhs) : std::strong_ordering::less|n Expected (expectedOrder): Qt::strong_ordering::equal' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='comparePointers(Qt::strong_ordering::less)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='comparePointers(Qt::strong_ordering::greater)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='comparePointers(Qt::strong_ordering::greater)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 2|n Right (rhs): 1|n Actual (lhs <=> rhs) : Qt::strong_ordering::greater|n Expected (expectedOrder): Qt::strong_ordering::equal' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='comparePointers(Qt::strong_ordering::greater)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 2|n Right (rhs): 1|n Actual (lhs <=> rhs) : std::strong_ordering::greater|n Expected (expectedOrder): Qt::strong_ordering::equal' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='comparePointers(Qt::strong_ordering::greater)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareToNullptr(Qt::strong_ordering::equivalent)' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareToNullptr(Qt::strong_ordering::equivalent)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareToNullptr(Qt::strong_ordering::less)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='compareToNullptr(Qt::strong_ordering::less)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): "nullptr"|n Right (rhs): 1|n Actual (lhs <=> rhs) : Qt::strong_ordering::less|n Expected (expectedOrder): Qt::strong_ordering::equal' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='compareToNullptr(Qt::strong_ordering::less)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): "nullptr"|n Right (rhs): 1|n Actual (lhs <=> rhs) : std::strong_ordering::less|n Expected (expectedOrder): Qt::strong_ordering::equal' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareToNullptr(Qt::strong_ordering::less)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareToNullptr(Qt::strong_ordering::greater)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='compareToNullptr(Qt::strong_ordering::greater)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 1|n Right (rhs): "nullptr"|n Actual (lhs <=> rhs) : Qt::strong_ordering::greater|n Expected (expectedOrder): Qt::strong_ordering::equal' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='compareToNullptr(Qt::strong_ordering::greater)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 1|n Right (rhs): "nullptr"|n Actual (lhs <=> rhs) : std::strong_ordering::greater|n Expected (expectedOrder): Qt::strong_ordering::equal' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareToNullptr(Qt::strong_ordering::greater)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareUnregisteredEnum(Qt::strong_ordering::equivalent)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='compareUnregisteredEnum(Qt::strong_ordering::equivalent)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 0|n Right (rhs): 0|n Actual (lhs <=> rhs) : Qt::strong_ordering::equal|n Expected (expectedOrder): Qt::strong_ordering::less' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='compareUnregisteredEnum(Qt::strong_ordering::equivalent)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 0|n Right (rhs): 0|n Actual (lhs <=> rhs) : std::strong_ordering::equal|n Expected (expectedOrder): Qt::strong_ordering::less' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareUnregisteredEnum(Qt::strong_ordering::equivalent)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareUnregisteredEnum(Qt::strong_ordering::less)' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareUnregisteredEnum(Qt::strong_ordering::less)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareUnregisteredEnum(Qt::strong_ordering::greater)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='compareUnregisteredEnum(Qt::strong_ordering::greater)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 1|n Right (rhs): 0|n Actual (lhs <=> rhs) : Qt::strong_ordering::greater|n Expected (expectedOrder): Qt::strong_ordering::less' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='compareUnregisteredEnum(Qt::strong_ordering::greater)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): 1|n Right (rhs): 0|n Actual (lhs <=> rhs) : std::strong_ordering::greater|n Expected (expectedOrder): Qt::strong_ordering::less' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareUnregisteredEnum(Qt::strong_ordering::greater)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareRegisteredEnum(Qt::strong_ordering::equivalent)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='compareRegisteredEnum(Qt::strong_ordering::equivalent)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): Monday|n Right (rhs): Monday|n Actual (lhs <=> rhs) : Qt::strong_ordering::equal|n Expected (expectedOrder): Qt::strong_ordering::greater' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='compareRegisteredEnum(Qt::strong_ordering::equivalent)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): Monday|n Right (rhs): Monday|n Actual (lhs <=> rhs) : std::strong_ordering::equal|n Expected (expectedOrder): Qt::strong_ordering::greater' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareRegisteredEnum(Qt::strong_ordering::equivalent)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareRegisteredEnum(Qt::strong_ordering::less)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='compareRegisteredEnum(Qt::strong_ordering::less)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): Monday|n Right (rhs): Sunday|n Actual (lhs <=> rhs) : Qt::strong_ordering::less|n Expected (expectedOrder): Qt::strong_ordering::greater' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='compareRegisteredEnum(Qt::strong_ordering::less)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): Monday|n Right (rhs): Sunday|n Actual (lhs <=> rhs) : std::strong_ordering::less|n Expected (expectedOrder): Qt::strong_ordering::greater' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareRegisteredEnum(Qt::strong_ordering::less)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareRegisteredEnum(Qt::strong_ordering::greater)' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareRegisteredEnum(Qt::strong_ordering::greater)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareCustomTypes(Qt::strong_ordering::equivalent)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='compareCustomTypes(Qt::strong_ordering::equivalent)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): MyClass(1)|n Right (rhs): MyClass(1)|n Actual (lhs <=> rhs) : Qt::strong_ordering::equal|n Expected (expectedOrder): Qt::strong_ordering::less' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='compareCustomTypes(Qt::strong_ordering::equivalent)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): MyClass(1)|n Right (rhs): MyClass(1)|n Actual (lhs <=> rhs) : std::strong_ordering::equal|n Expected (expectedOrder): Qt::strong_ordering::less' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareCustomTypes(Qt::strong_ordering::equivalent)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareCustomTypes(Qt::strong_ordering::less)' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareCustomTypes(Qt::strong_ordering::less)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='compareCustomTypes(Qt::strong_ordering::greater)' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='compareCustomTypes(Qt::strong_ordering::greater)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): MyClass(2)|n Right (rhs): MyClass(1)|n Actual (lhs <=> rhs) : Qt::strong_ordering::greater|n Expected (expectedOrder): Qt::strong_ordering::less' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='compareCustomTypes(Qt::strong_ordering::greater)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (lhs): MyClass(2)|n Right (rhs): MyClass(1)|n Actual (lhs <=> rhs) : std::strong_ordering::greater|n Expected (expectedOrder): Qt::strong_ordering::less' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='compareCustomTypes(Qt::strong_ordering::greater)' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='stdCompareInts(std::strong_ordering::equivalent)' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='stdCompareInts(std::strong_ordering::equivalent)' flowId='tst_ThreeWayCompare']
@@ -133,7 +133,7 @@
 ##teamcity[testFailed name='checkComparisonForTemporaryObjects()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0|n Right (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1|n Actual (getClassForValue(0).getValuePointer() <=> getClassForValue(1).getValuePointer()): std::strong_ordering::less|n Expected (std::strong_ordering::equal) : std::strong_ordering::equal' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='checkComparisonForTemporaryObjects()' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='checkWeakComparison()' flowId='tst_ThreeWayCompare']
-##teamcity[testFailed name='checkWeakComparison()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (june) : 2012/06/20 14:33:02.500|[CEST|]|n Right (juneLater): 2012/06/20 14:33:02.501|[CEST|]|n Actual (june <=> juneLater) : Qt::weak_ordering::less|n Expected (Qt::weak_ordering::greater): Qt::weak_ordering::greater' flowId='tst_ThreeWayCompare']
+##teamcity[testFailed name='checkWeakComparison()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)|]' details='The result of operator<=>() is not what was expected|n Left (june) : 2012/06/20 14:33:02.500|[CEST|]|n Right (juneLater): 2012/06/20 14:33:02.501|[CEST|]|n Actual (june <=> juneLater) : std::weak_ordering::less|n Expected (Qt::weak_ordering::greater): Qt::weak_ordering::greater' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='checkWeakComparison()' flowId='tst_ThreeWayCompare']
 ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_ThreeWayCompare']
 ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_ThreeWayCompare']
diff --git a/tests/auto/testlib/selftests/expected_threewaycompare.txt b/tests/auto/testlib/selftests/expected_threewaycompare.txt
index 728c85c9201..896cec72819 100644
--- a/tests/auto/testlib/selftests/expected_threewaycompare.txt
+++ b/tests/auto/testlib/selftests/expected_threewaycompare.txt
@@ -5,38 +5,38 @@ PASS   : tst_ThreeWayCompare::compareInts(Qt::strong_ordering::equivalent)
 FAIL!  : tst_ThreeWayCompare::compareInts(Qt::strong_ordering::less) The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 2
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 FAIL!  : tst_ThreeWayCompare::compareInts(Qt::strong_ordering::greater) The result of operator<=>() is not what was expected
    Left     (lhs): 2
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 FAIL!  : tst_ThreeWayCompare::compareFloats(Qt::partial_ordering::equivalent) The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::equivalent
+   Actual   (lhs <=> rhs)  : std::partial_ordering::equivalent
    Expected (expectedOrder): Qt::partial_ordering::less
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 PASS   : tst_ThreeWayCompare::compareFloats(Qt::partial_ordering::less)
 FAIL!  : tst_ThreeWayCompare::compareFloats(Qt::partial_ordering::greater) The result of operator<=>() is not what was expected
    Left     (lhs): 1.1
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::greater
+   Actual   (lhs <=> rhs)  : std::partial_ordering::greater
    Expected (expectedOrder): Qt::partial_ordering::less
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 FAIL!  : tst_ThreeWayCompare::compareDoubles(Qt::partial_ordering::equivalent) The result of operator<=>() is not what was expected
    Left     (lhs): 0
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::equivalent
+   Actual   (lhs <=> rhs)  : std::partial_ordering::equivalent
    Expected (expectedOrder): Qt::partial_ordering::greater
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 FAIL!  : tst_ThreeWayCompare::compareDoubles(Qt::partial_ordering::less) The result of operator<=>() is not what was expected
    Left     (lhs): 0
    Right    (rhs): 0.1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::less
+   Actual   (lhs <=> rhs)  : std::partial_ordering::less
    Expected (expectedOrder): Qt::partial_ordering::greater
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 PASS   : tst_ThreeWayCompare::compareDoubles(Qt::partial_ordering::greater)
@@ -44,65 +44,65 @@ PASS   : tst_ThreeWayCompare::comparePointers(Qt::strong_ordering::equivalent)
 FAIL!  : tst_ThreeWayCompare::comparePointers(Qt::strong_ordering::less) The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 2
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 FAIL!  : tst_ThreeWayCompare::comparePointers(Qt::strong_ordering::greater) The result of operator<=>() is not what was expected
    Left     (lhs): 2
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 PASS   : tst_ThreeWayCompare::compareToNullptr(Qt::strong_ordering::equivalent)
 FAIL!  : tst_ThreeWayCompare::compareToNullptr(Qt::strong_ordering::less) The result of operator<=>() is not what was expected
    Left     (lhs): "nullptr"
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 FAIL!  : tst_ThreeWayCompare::compareToNullptr(Qt::strong_ordering::greater) The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): "nullptr"
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 FAIL!  : tst_ThreeWayCompare::compareUnregisteredEnum(Qt::strong_ordering::equivalent) The result of operator<=>() is not what was expected
    Left     (lhs): 0
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::less
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 PASS   : tst_ThreeWayCompare::compareUnregisteredEnum(Qt::strong_ordering::less)
 FAIL!  : tst_ThreeWayCompare::compareUnregisteredEnum(Qt::strong_ordering::greater) The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::less
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 FAIL!  : tst_ThreeWayCompare::compareRegisteredEnum(Qt::strong_ordering::equivalent) The result of operator<=>() is not what was expected
    Left     (lhs): Monday
    Right    (rhs): Monday
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::greater
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 FAIL!  : tst_ThreeWayCompare::compareRegisteredEnum(Qt::strong_ordering::less) The result of operator<=>() is not what was expected
    Left     (lhs): Monday
    Right    (rhs): Sunday
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::greater
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 PASS   : tst_ThreeWayCompare::compareRegisteredEnum(Qt::strong_ordering::greater)
 FAIL!  : tst_ThreeWayCompare::compareCustomTypes(Qt::strong_ordering::equivalent) The result of operator<=>() is not what was expected
    Left     (lhs): MyClass(1)
    Right    (rhs): MyClass(1)
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::less
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 PASS   : tst_ThreeWayCompare::compareCustomTypes(Qt::strong_ordering::less)
 FAIL!  : tst_ThreeWayCompare::compareCustomTypes(Qt::strong_ordering::greater) The result of operator<=>() is not what was expected
    Left     (lhs): MyClass(2)
    Right    (rhs): MyClass(1)
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::less
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 PASS   : tst_ThreeWayCompare::stdCompareInts(std::strong_ordering::equivalent)
@@ -218,7 +218,7 @@ FAIL!  : tst_ThreeWayCompare::checkComparisonForTemporaryObjects() The result of
 FAIL!  : tst_ThreeWayCompare::checkWeakComparison() The result of operator<=>() is not what was expected
    Left     (june)     : 2012/06/20 14:33:02.500[CEST]
    Right    (juneLater): 2012/06/20 14:33:02.501[CEST]
-   Actual   (june <=> juneLater)        : Qt::weak_ordering::less
+   Actual   (june <=> juneLater)        : std::weak_ordering::less
    Expected (Qt::weak_ordering::greater): Qt::weak_ordering::greater
    Loc: [qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp(0)]
 PASS   : tst_ThreeWayCompare::cleanupTestCase()
diff --git a/tests/auto/testlib/selftests/expected_threewaycompare.xml b/tests/auto/testlib/selftests/expected_threewaycompare.xml
index 9bd8c191ca8..5e8f1f93bac 100644
--- a/tests/auto/testlib/selftests/expected_threewaycompare.xml
+++ b/tests/auto/testlib/selftests/expected_threewaycompare.xml
@@ -18,7 +18,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 2
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp" line="0">
@@ -26,7 +26,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 2
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal]]></Description>
     </Incident>
     <Duration msecs="0"/>
@@ -37,7 +37,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::equivalent
+   Actual   (lhs <=> rhs)  : std::partial_ordering::equivalent
    Expected (expectedOrder): Qt::partial_ordering::less]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
@@ -48,7 +48,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 1.1
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::greater
+   Actual   (lhs <=> rhs)  : std::partial_ordering::greater
    Expected (expectedOrder): Qt::partial_ordering::less]]></Description>
     </Incident>
     <Duration msecs="0"/>
@@ -59,7 +59,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 0
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::equivalent
+   Actual   (lhs <=> rhs)  : std::partial_ordering::equivalent
    Expected (expectedOrder): Qt::partial_ordering::greater]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp" line="0">
@@ -67,7 +67,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 0
    Right    (rhs): 0.1
-   Actual   (lhs <=> rhs)  : Qt::partial_ordering::less
+   Actual   (lhs <=> rhs)  : std::partial_ordering::less
    Expected (expectedOrder): Qt::partial_ordering::greater]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
@@ -84,7 +84,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 2
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp" line="0">
@@ -92,7 +92,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 2
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal]]></Description>
     </Incident>
     <Duration msecs="0"/>
@@ -106,7 +106,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): "nullptr"
    Right    (rhs): 1
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::equal]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp" line="0">
@@ -114,7 +114,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): "nullptr"
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::equal]]></Description>
     </Incident>
     <Duration msecs="0"/>
@@ -125,7 +125,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 0
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::less]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
@@ -136,7 +136,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): 1
    Right    (rhs): 0
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::less]]></Description>
     </Incident>
     <Duration msecs="0"/>
@@ -147,7 +147,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): Monday
    Right    (rhs): Monday
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::greater]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/threewaycompare/tst_threewaycompare.cpp" line="0">
@@ -155,7 +155,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): Monday
    Right    (rhs): Sunday
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::less
+   Actual   (lhs <=> rhs)  : std::strong_ordering::less
    Expected (expectedOrder): Qt::strong_ordering::greater]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
@@ -169,7 +169,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): MyClass(1)
    Right    (rhs): MyClass(1)
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::equal
+   Actual   (lhs <=> rhs)  : std::strong_ordering::equal
    Expected (expectedOrder): Qt::strong_ordering::less]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
@@ -180,7 +180,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (lhs): MyClass(2)
    Right    (rhs): MyClass(1)
-   Actual   (lhs <=> rhs)  : Qt::strong_ordering::greater
+   Actual   (lhs <=> rhs)  : std::strong_ordering::greater
    Expected (expectedOrder): Qt::strong_ordering::less]]></Description>
     </Incident>
     <Duration msecs="0"/>
@@ -376,7 +376,7 @@
       <Description><![CDATA[The result of operator<=>() is not what was expected
    Left     (june)     : 2012/06/20 14:33:02.500[CEST]
    Right    (juneLater): 2012/06/20 14:33:02.501[CEST]
-   Actual   (june <=> juneLater)        : Qt::weak_ordering::less
+   Actual   (june <=> juneLater)        : std::weak_ordering::less
    Expected (Qt::weak_ordering::greater): Qt::weak_ordering::greater]]></Description>
     </Incident>
     <Duration msecs="0"/>