summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus/MatchingText.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-05-20 20:42:40 +0200
committerhjk <qthjk@ovi.com>2012-05-28 00:28:30 +0200
commite58f203e4c6bb4dc6eb613449c71f199aa243e01 (patch)
tree0f2e9a110029b6369613bb8c0e26c34a34238701 /src/libs/cplusplus/MatchingText.cpp
parent753acdcf82d3371dc6de12b8c5980486b74658c6 (diff)
downloadqt-creator-e58f203e4c6bb4dc6eb613449c71f199aa243e01.tar.gz
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>
Diffstat (limited to 'src/libs/cplusplus/MatchingText.cpp')
-rw-r--r--src/libs/cplusplus/MatchingText.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp
index d4b3566ad9..cb0e68571c 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