From 8bd2e6d0d497da9362038d5e852cea1091d3622c Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 1 Feb 2022 11:11:20 +0100 Subject: [PATCH] Fix clang-cl build of tst_qobject Not MSVC, but pretends to be. Pick-to: 6.3 6.2 Change-Id: I5c201dd917e79a22d6ef15715bf1d3a7010d123e Reviewed-by: Thiago Macieira --- tests/auto/corelib/kernel/qobject/tst_qobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index 2e34099e5b0..bf302828221 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -7337,7 +7337,7 @@ void tst_QObject::checkArgumentsForNarrowing() // GCC, GHS and clang don't implement this properly yet: // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99625 // https://bugs.llvm.org/show_bug.cgi?id=49676 -#if defined(Q_CC_MSVC) // at least since VS2017 +#if defined(Q_CC_MSVC) && !defined(Q_CC_CLANG) // at least since VS2017 struct ConstructibleFromInt { /* implicit */ ConstructibleFromInt(int) {} };