diff --git a/src/corelib/tools/qtyperevision.h b/src/corelib/tools/qtyperevision.h
index 8f255a77e89..c2b344f3400 100644
--- a/src/corelib/tools/qtyperevision.h
+++ b/src/corelib/tools/qtyperevision.h
@@ -45,9 +45,11 @@ public:
     static constexpr bool isValidSegment(Integer segment)
     {
         // using extra parentheses around max to avoid expanding it if it is a macro
+        // and adding zero to cause it to be promoted
+        constexpr auto Max = (std::numeric_limits<Integer>::max)() + 0;
+        constexpr bool HasSufficientRange = Max >= SegmentUnknown;
         return segment >= Integer(0)
-                && ((std::numeric_limits<Integer>::max)() < Integer(SegmentUnknown)
-                    || segment < Integer(SegmentUnknown));
+                && (!HasSufficientRange || segment < Integer(SegmentUnknown));
     }
 
     template<typename Major, typename Minor,
diff --git a/tests/auto/corelib/tools/qtyperevision/tst_qtyperevision.cpp b/tests/auto/corelib/tools/qtyperevision/tst_qtyperevision.cpp
index 222cb5bd122..351c3314256 100644
--- a/tests/auto/corelib/tools/qtyperevision/tst_qtyperevision.cpp
+++ b/tests/auto/corelib/tools/qtyperevision/tst_qtyperevision.cpp
@@ -95,7 +95,7 @@ void tst_QTypeRevision::qTypeRevision()
 void tst_QTypeRevision::qTypeRevisionTypes()
 {
     compileTestRevision<quint8>();
-    // compileTestRevision<qint8>();
+    compileTestRevision<qint8>();
     compileTestRevision<quint16>();
     compileTestRevision<qint16>();
     compileTestRevision<quint32>();
@@ -104,7 +104,7 @@ void tst_QTypeRevision::qTypeRevisionTypes()
     compileTestRevision<qint64>();
     compileTestRevision<long>();
     compileTestRevision<ulong>();
-    // compileTestRevision<char>();
+    compileTestRevision<char>();
 
     QVERIFY(!QTypeRevision::isValidSegment(0xff));
     QVERIFY(!QTypeRevision::isValidSegment(-1));