diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake
index 13da9775f0..9dbf63000c 100644
--- a/cmake/QtInternalTargets.cmake
+++ b/cmake/QtInternalTargets.cmake
@@ -239,14 +239,17 @@ if (MSVC)
             )
         endif()
     endif()
-    if (MSVC_VERSION GREATER_EQUAL 1909 AND NOT CLANG)
+    if (MSVC_VERSION GREATER_EQUAL 1909 AND NOT CLANG) # MSVC 2017
         target_compile_options(PlatformCommonInternal INTERFACE
             -Zc:referenceBinding
+            -Zc:ternary
         )
     endif()
-    if (MSVC_VERSION GREATER_EQUAL 1919 AND NOT CLANG)
+    if (MSVC_VERSION GREATER_EQUAL 1919 AND NOT CLANG) # MSVC 2019
         target_compile_options(PlatformCommonInternal INTERFACE
             -Zc:externConstexpr
+            -Zc:lambda
+            -Zc:preprocessor
         )
     endif()
 
diff --git a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
index e4f3759c6f..deda275c8a 100644
--- a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
+++ b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
@@ -2625,7 +2625,7 @@ void tst_QStringApiSymmetry::toNumberWithBases_data()
     QTest::addColumn<qint64>("result");
     QTest::addColumn<bool>("ok");
 
-    constexpr struct {
+    static constexpr struct {
         const char prefix[3];
         int base;
     } bases[] = {