From e58f203e4c6bb4dc6eb613449c71f199aa243e01 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sun, 20 May 2012 20:42:40 +0200
Subject: [PATCH] Silence a warning about unrecognised pragma with ICC
src/libs/cplusplus/MatchingText.cpp(64): warning #161: unrecognized #pragma
# pragma GCC diagnostic ignored "-Wstrict-overflow"
^
This pragma is recognised in GCC only, so don't enable it for when ICC
fakes to be GCC.
Change-Id: I3d9830dc2b12632dd08d8c8961219bd253ad8c1d
Reviewed-by: hjk <qthjk@ovi.com>
---
src/libs/cplusplus/MatchingText.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp
index d4b3566ad90..cb0e68571c5 100644
--- a/src/libs/cplusplus/MatchingText.cpp
+++ b/src/libs/cplusplus/MatchingText.cpp
@@ -60,7 +60,7 @@ static bool shouldOverrideChar(QChar ch)
// qstring.h:1175:39: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false
//
// caused by Q_ASSERT in QStringRef::at()
-#ifdef Q_CC_GNU
+#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL)
# pragma GCC diagnostic ignored "-Wstrict-overflow"
#endif
--
GitLab