diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
index c582b1f238..7ef2741746 100644
--- a/src/corelib/global/qcompilerdetection.h
+++ b/src/corelib/global/qcompilerdetection.h
@@ -572,6 +572,9 @@
 #      if _MSC_VER < 1900
 //       ICC disables unicode string support when compatibility mode with MSVC 2013 or lower is active
 #        undef Q_COMPILER_UNICODE_STRINGS
+//       Disable constexpr unless the MS headers have constexpr in all the right places too
+//       (like std::numeric_limits<T>::max())
+#        undef Q_COMPILER_CONSTEXPR
 #      endif
 #    endif
 #  endif