From 33c4dd83836ee4b3f52458ef7c6241cf35110630 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Mon, 6 May 2019 22:38:12 +0200 Subject: [PATCH] Fix build with clang-cl This fixes qmake build with clang-cl Change-Id: I357cd5f3abcbaf415469a268f18f7ab607f7abe6 Reviewed-by: Christian Kandeler --- src/libs/qtcreatorcdbext/common.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/libs/qtcreatorcdbext/common.h b/src/libs/qtcreatorcdbext/common.h index b538313b3f7..fd76c1be7e4 100644 --- a/src/libs/qtcreatorcdbext/common.h +++ b/src/libs/qtcreatorcdbext/common.h @@ -34,9 +34,16 @@ #include #define KDEXT_64BIT -#pragma warning( disable : 4838 ) -#include -#pragma warning( default : 4838 ) +#ifdef __clang__ +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wc++11-narrowing" +# include +# pragma clang diagnostic pop +#else +# pragma warning( disable : 4838 ) +# include +# pragma warning( default : 4838 ) +#endif // __clang__ #include typedef IDebugControl3 CIDebugControl;