Fix ICC-on-Mac warning about unknown #pragma
authorThiago Macieira <thiago.macieira@intel.com>
Thu, 30 Oct 2014 21:10:34 +0000 (14:10 -0700)
committerThiago Macieira <thiago.macieira@intel.com>
Thu, 30 Oct 2014 21:49:05 +0000 (22:49 +0100)
qqml.h(506): warning #161: unrecognized #pragma

Change-Id: I089007db4c4d0701eff32ce0b1c2fff1f65d5c48
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
src/qml/qml/qqml.h

index 0cab824..77beb57 100644 (file)
@@ -502,7 +502,7 @@ namespace QtQml {
 }
 #endif
 
-#ifdef Q_CC_CLANG
+#if defined(Q_CC_CLANG) && !defined(Q_CC_INTEL)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wheader-hygiene"
 #endif
@@ -510,7 +510,7 @@ namespace QtQml {
 // This is necessary to allow for QtQuick1 and QtQuick2 scenes in a single application.
 using namespace QtQml;
 
-#ifdef Q_CC_CLANG
+#if defined(Q_CC_CLANG) && !defined(Q_CC_INTEL)
 #pragma clang diagnostic pop
 #endif