diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake
index 9dbf63000cf..363d510fd14 100644
--- a/cmake/QtInternalTargets.cmake
+++ b/cmake/QtInternalTargets.cmake
@@ -248,7 +248,7 @@ if (MSVC)
     if (MSVC_VERSION GREATER_EQUAL 1919 AND NOT CLANG) # MSVC 2019
         target_compile_options(PlatformCommonInternal INTERFACE
             -Zc:externConstexpr
-            -Zc:lambda
+            #-Zc:lambda # Buggy. TODO: Enable again when stable enough.
             -Zc:preprocessor
         )
     endif()
diff --git a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
index 0360a61832e..91b25928772 100644
--- a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
+++ b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
@@ -2626,7 +2626,7 @@ void tst_QStringApiSymmetry::toNumberWithBases_data()
     QTest::addColumn<qint64>("result");
     QTest::addColumn<bool>("ok");
 
-    static constexpr struct {
+    constexpr struct {
         const char prefix[3];
         int base;
     } bases[] = {