diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-11 14:38:47 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-12 03:37:11 +0000 |
| commit | e45516ea0d41f215cddf1a51efe15998c74817a9 (patch) | |
| tree | fdc50dd07e79160fecea2069181f2ab5e089b12c /src | |
| parent | 8ccd38d20dfe4d9b359d54d3b308fc3234b9c815 (diff) | |
QSysInfo: Bring back suppression of ICC warning #1478
Turns out that different versions of ICC use different warning numbers.
The Linux and Windows compilers emit 1786, but the macOS one emits 1478.
Don't ask me why.
Change-Id: I523b0abacd5148b2bf08fffd14b475a4c4d89ba1
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qsysinfo.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h index ff0a784ace..f443ab4b93 100644 --- a/src/corelib/global/qsysinfo.h +++ b/src/corelib/global/qsysinfo.h @@ -213,6 +213,7 @@ public: QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations") +QT_WARNING_DISABLE_INTEL(1478) QT_WARNING_DISABLE_INTEL(1786) QT_WARNING_DISABLE_MSVC(4996) #if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) |