From bd3a4ff1d07e1afa5769f0cbf8de89c7bc3b96ea Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 30 Oct 2014 14:10:34 -0700
Subject: [PATCH] Fix ICC-on-Mac warning about unknown #pragma
qqml.h(506): warning #161: unrecognized #pragma
Change-Id: I089007db4c4d0701eff32ce0b1c2fff1f65d5c48
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
src/qml/qml/qqml.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h
index 0cab824aca..77beb5722d 100644
--- a/src/qml/qml/qqml.h
+++ b/src/qml/qml/qqml.h
@@ -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
--
GitLab