From 70d46c20f1c75d4124ed5e8cca98066ef1fe94a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Wed, 31 Jul 2024 15:00:56 +0200 Subject: [PATCH] QVariant: fix msvc version comparison for c++20 support check Was meant to be >=, not <. Amends ab06d402dd833cefe9c0d929c13e93068aab96d9 Pick-to: 6.7 Change-Id: I5aa2236d2ffc7274e14918aea28c9a3e3545b6c4 Reviewed-by: Marc Mutz (cherry picked from commit d6eda60b330e72570be9ce43ce5dc01cd8851665) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qcompilerdetection.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index b2340bff8ec..4ead3524930 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1406,9 +1406,9 @@ QT_WARNING_DISABLE_MSVC(4530) /* C++ exception handler used, but unwind semantic #endif #if defined(__cplusplus) && __cplusplus >= 202002L // P0846 doesn't have a feature macro :/ -# if !defined(Q_CC_MSVC_ONLY) || Q_CC_MSVC < 1939 // claims C++20 support but lacks P0846 - // 1939 is known to work - // 1936 is known to fail +# if !defined(Q_CC_MSVC_ONLY) || Q_CC_MSVC >= 1939 // claims C++20 support but lacks P0846 + // 1939 is known to work + // 1936 is known to fail # define QT_COMPILER_HAS_P0846 # endif #endif