From 1ee43844d471a389d7ad8e6f2e655ac9ed2a7017 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 10 Jun 2025 16:44:28 +0200 Subject: [PATCH] Exclude MSVC version 19.44 in tst_qcheckedint and tst_qnumeric MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Still causing an internal compiler error with the currently latest VC++ version. Amends 4e3a1675793995e44f5c84f28bfdc0fd02aa27cc. Pick-to: 6.10 Change-Id: Ia4290c9b21eb8163180d725ed200629e36e85f1f Reviewed-by: Mårten Nordheim --- tests/auto/corelib/global/qcheckedint/tst_qcheckedint.cpp | 2 +- tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/corelib/global/qcheckedint/tst_qcheckedint.cpp b/tests/auto/corelib/global/qcheckedint/tst_qcheckedint.cpp index 65153936b63..fe509e558c6 100644 --- a/tests/auto/corelib/global/qcheckedint/tst_qcheckedint.cpp +++ b/tests/auto/corelib/global/qcheckedint/tst_qcheckedint.cpp @@ -347,7 +347,7 @@ void tst_QCheckedInt::division() // This causes an internal compiler error on MSVC, so skipping it there // Integrity's compiler says this code isn't constexpr. -#if (!defined(Q_CC_MSVC) || Q_CC_MSVC > 1943) && !defined(Q_CC_GHS) +#if (!defined(Q_CC_MSVC) || Q_CC_MSVC > 1944) && !defined(Q_CC_GHS) template constexpr bool checkedIntTypeProperties() diff --git a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp index 9899850debe..d33f343045b 100644 --- a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp +++ b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp @@ -1017,7 +1017,7 @@ SUB_OVERFLOW_UNSIGNED_TYPE_TEST(ulong, ULONG_MAX) #if defined(QT_HAS_128_BIT_MULTIPLICATION) // Compiling this causes an ICE in MSVC, so skipping it -#if !defined(Q_CC_MSVC) || Q_CC_MSVC > 1943 +#if !defined(Q_CC_MSVC) || Q_CC_MSVC > 1944 SIGNED_TYPE_TEST(qlonglong, LLONG_MIN, LLONG_MAX) UNSIGNED_TYPE_TEST(qulonglong, ULLONG_MAX) #endif