diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-10-30 14:10:34 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-10-30 22:49:05 +0100 |
| commit | bd3a4ff1d07e1afa5769f0cbf8de89c7bc3b96ea (patch) | |
| tree | da68b8dab945dfd0e857dd2e98044535bdca13d1 /src/qml/qml/qqml.h | |
| parent | 7ce2c0c9ac65c6e6ee8c50af0f649e3e6e05acfd (diff) | |
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>
Diffstat (limited to 'src/qml/qml/qqml.h')
| -rw-r--r-- | src/qml/qml/qqml.h | 4 |
1 files 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 |