summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
diff options
context:
space:
mode:
authorMÃ¥rten Nordheim <marten.nordheim@qt.io>2024-03-13 18:40:59 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-04-04 14:24:26 +0000
commited8589e35b44aeb874c4b36f38be4d0bc3c1accd (patch)
tree0cb05e153cdfdc5c75d0dda7def4808c31e9285c /tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
parent4e3c55e10da297e38ba45a35d7d0506b9f3bf989 (diff)
tst_qfuture: Update EXPECT_FAIL msvc condition6.6
It is passing on my machine with Visual Studio 17.10 Preview 1. But only with C++20 enabled. Pick-to: 6.5 Task-number: QTBUG-101761 Change-Id: Ia5af3d75d35dda1df9b39bdc94f07dd746ff60af Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 6c0be8acc44df9eec2c64527696bb137650124ba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a3ee0db4bfbaa0f5a3458de81a4bec23ff2b40a4)
Diffstat (limited to 'tests/auto/corelib/thread/qfuture/tst_qfuture.cpp')
-rw-r--r--tests/auto/corelib/thread/qfuture/tst_qfuture.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
index 6a4fd01fd2..284514524e 100644
--- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
+++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
@@ -3904,7 +3904,7 @@ void tst_QFuture::signalConnect()
{
SenderObject sender;
-#if defined(Q_CC_MSVC) && !defined(Q_CC_CLANG)
+#if defined(Q_CC_MSVC_ONLY) && (Q_CC_MSVC < 1940 || __cplusplus < 202002L)
#define EXPECT_FUTURE_CONNECT_FAIL() QEXPECT_FAIL("", "QTBUG-101761, test fails on Windows/MSVC", Continue)
#else
QTest::ignoreMessage(QtWarningMsg, "QObject::connect: signal not found in SenderObject");