diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-25 11:53:26 -0300 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-26 12:53:36 +0000 |
| commit | ac9103fd859d1c2fd1b42e36d87285935110b391 (patch) | |
| tree | 163e575a7e92f35ebfded139fbd0a41bdcd52385 /src/corelib | |
| parent | 2d2dd857669baf51fadad9608e6d6a0c08bbb373 (diff) | |
Fix ICC build with Q_FALLTHROUGH
ICC 17 does not yet implement C++17 [[fallthrough]] nor does it support
GCC's __attribute__((fallthrough))
Change-Id: I84e363d735b443cb9beefffd14b8aba60a7e3f81
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/corelib')
| -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 5fc7ac9c7e..173ada89de 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1345,7 +1345,7 @@ #endif #endif #ifndef Q_FALLTHROUGH -# if defined(Q_CC_GNU) && Q_CC_GNU >= 700 +# if (defined(Q_CC_GNU) && Q_CC_GNU >= 700) && !defined(Q_CC_INTEL) # define Q_FALLTHROUGH() __attribute__((fallthrough)) # else # define Q_FALLTHROUGH() (void)0 |