diff options
| author | Yuhang Zhao <2546789017@qq.com> | 2022-10-18 09:26:32 +0800 |
|---|---|---|
| committer | Yuhang Zhao <2546789017@qq.com> | 2022-10-18 19:31:25 +0800 |
| commit | ade68c99497f6b9c94273421f84fb8dc951554fa (patch) | |
| tree | d60e6c702f2ff81f29c668aafc7ddfc01f2e668f | |
| parent | b1054d45e996065ea8d8738a2ec862b98e1aae2b (diff) | |
MSVC: Disable buggy conformance check
/Zc:lambda seems buggy. Although in my experiments it works well
for 99% Qt repos, it seems some tests will trigger the bug and it
also blocks some new commits. So disable it for now, it's not stable
enough.
Now that this check is disabled, the workaround for tst_qstringapisymmetry
is also not needed anymore, so remove the workaround as well.
Partially reverts commit 8cb832090a8a0e7226904561f97c6de954d752ed
Change-Id: Icf0ecbbaa6262522470e5f5dea05705985ab18f1
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | cmake/QtInternalTargets.cmake | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp | 2 |
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[] = { |