diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-02-01 11:11:20 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-03 18:07:48 +0000 |
| commit | 69bc9a87007363346fe10db9be8be784435218bb (patch) | |
| tree | 230e396d86acbaa7916cbd34a4a9967fd3628fa9 /tests | |
| parent | 84a0adffe8a9488eb6114fbfb025f21d1bff095c (diff) | |
Fix clang-cl build of tst_qobject
Not MSVC, but pretends to be.
Change-Id: I5c201dd917e79a22d6ef15715bf1d3a7010d123e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 8bd2e6d0d497da9362038d5e852cea1091d3622c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/kernel/qobject/tst_qobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index 2e34099e5b..bf30282822 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) {} }; |