diff --git a/src/corelib/global/qcompare.h b/src/corelib/global/qcompare.h
index 0966cdfe9e..cda5b4c595 100644
--- a/src/corelib/global/qcompare.h
+++ b/src/corelib/global/qcompare.h
@@ -641,14 +641,15 @@ auto qCompareThreeWay(const LeftType &lhs, const RightType &rhs);
 
 template <typename LT, typename RT,
           std::enable_if_t<
-                  QtOrderingPrivate::CompareThreeWayTester::hasCompareThreeWay<LT, RT>
-                    || QtOrderingPrivate::CompareThreeWayTester::hasCompareThreeWay<RT, LT>,
+                  std::disjunction_v<
+                          QtOrderingPrivate::CompareThreeWayTester::HasCompareThreeWay<LT, RT>,
+                          QtOrderingPrivate::CompareThreeWayTester::HasCompareThreeWay<RT, LT>>,
                   bool> = true>
 auto qCompareThreeWay(const LT &lhs, const RT &rhs)
         noexcept(QtOrderingPrivate::CompareThreeWayTester::compareThreeWayNoexcept<LT, RT>())
 {
     using Qt::compareThreeWay;
-    if constexpr (QtOrderingPrivate::CompareThreeWayTester::hasCompareThreeWay<LT, RT>) {
+    if constexpr (QtOrderingPrivate::CompareThreeWayTester::hasCompareThreeWay_v<LT, RT>) {
         return compareThreeWay(lhs, rhs);
     } else {
         const auto retval = compareThreeWay(rhs, lhs);
diff --git a/src/corelib/global/qcomparehelpers.h b/src/corelib/global/qcomparehelpers.h
index dcaa886bcd..a44569aa72 100644
--- a/src/corelib/global/qcomparehelpers.h
+++ b/src/corelib/global/qcomparehelpers.h
@@ -873,12 +873,15 @@ using Qt::compareThreeWay;
 // Check if compareThreeWay is implemented for the (LT, RT) argument
 // pair.
 template <typename LT, typename RT, typename = void>
-constexpr inline bool hasCompareThreeWay = false;
+struct HasCompareThreeWay : std::false_type {};
 
 template <typename LT, typename RT>
-constexpr inline bool hasCompareThreeWay<
+struct HasCompareThreeWay<
         LT, RT, std::void_t<decltype(compareThreeWay(std::declval<LT>(), std::declval<RT>()))>
-    > = true;
+    > : std::true_type {};
+
+template <typename LT, typename RT>
+constexpr inline bool hasCompareThreeWay_v = HasCompareThreeWay<LT, RT>::value;
 
 // Check if the operation is noexcept. We have two different overloads,
 // depending on the available compareThreeWay() implementation.
@@ -886,12 +889,13 @@ constexpr inline bool hasCompareThreeWay<
 // context.
 
 template <typename LT, typename RT,
-          std::enable_if_t<hasCompareThreeWay<LT, RT>, bool> = true>
+          std::enable_if_t<hasCompareThreeWay_v<LT, RT>, bool> = true>
 constexpr bool compareThreeWayNoexcept() noexcept
 { return noexcept(compareThreeWay(std::declval<LT>(), std::declval<RT>())); }
 
 template <typename LT, typename RT,
-          std::enable_if_t<!hasCompareThreeWay<LT, RT> && hasCompareThreeWay<RT, LT>,
+          std::enable_if_t<std::conjunction_v<std::negation<HasCompareThreeWay<LT, RT>>,
+                                              HasCompareThreeWay<RT, LT>>,
                            bool> = true>
 constexpr bool compareThreeWayNoexcept() noexcept
 { return noexcept(compareThreeWay(std::declval<RT>(), std::declval<LT>())); }