diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-01-31 22:48:15 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-16 05:12:06 +0100 |
| commit | 0da7a4c4afe2bfe55decaf3c30eba16c60380ec4 (patch) | |
| tree | 77fb09252ab9fac65c14d6a852424f075c34fa07 /src/corelib/global | |
| parent | 1e43b64a7a5c3823a6bdcb8d0cd28a17955939a2 (diff) | |
Work around ICC 14 bug: __attribute__((deprecated)) with text
Apparently it doesn't like the text.
Change-Id: If8e14df84f0d9915018eac94df16bf1b679155e0
Reviewed-by: Keith Gardner <kreios4004@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 9bc43a3186..0513db1575 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -153,7 +153,7 @@ # define Q_CC_INTEL # define Q_ASSUME_IMPL(expr) __assume(expr) # define Q_UNREACHABLE_IMPL() __builtin_unreachable() -# if __INTEL_COMPILER >= 1300 +# if __INTEL_COMPILER >= 1300 && !defined(__APPLE__) # define Q_DECL_DEPRECATED_X(text) __attribute__ ((__deprecated__(text))) # endif # elif defined(__clang__) |