summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmake/QtInternalTargets.cmake2
-rw-r--r--tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake
index 9dbf63000c..363d510fd1 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 0360a61832..91b2592877 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[] = {