summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2024-03-13 18:40:59 +0100
committerMårten Nordheim <marten.nordheim@qt.io>2024-03-18 14:59:26 +0100
commit6c0be8acc44df9eec2c64527696bb137650124ba (patch)
treedfa05d152685dd3f69edb474db1ef2cfec167502
parent1618ff825c2198705fedde9c284a0c52bcce5b89 (diff)
tst_qfuture: Update EXPECT_FAIL msvc condition
It is passing on my machine with Visual Studio 17.10 Preview 1. But only with C++20 enabled. Pick-to: 6.7 6.6 6.5 Task-number: QTBUG-101761 Change-Id: Ia5af3d75d35dda1df9b39bdc94f07dd746ff60af Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-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 41cc8ee4d8..3fc796514d 100644
--- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
+++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
@@ -3907,7 +3907,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");