diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-03-22 23:42:12 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-04 23:35:11 +0200 |
| commit | d041ae30d62a332d492c7bc0dfe353f561435ff3 (patch) | |
| tree | c07b1d9d102c8632856a5554f7764698d29ffcc2 /src/corelib/global/qlibraryinfo.cpp | |
| parent | 790bc92bc0c3185971a74d231a8bfe1bbf0b2bd1 (diff) | |
Add detection for the Intel compiler in QLibraryInfo::build()
Change-Id: I26ed74ac963226abc42d50c0edac6ce9a1c0fd23
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/corelib/global/qlibraryinfo.cpp')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 39bfd339c3..d31916abeb 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -255,7 +255,9 @@ QLibraryInfo::buildDate() } #endif //QT_NO_DATESTRING -#if defined(Q_CC_CLANG) // must be before GNU, because clang claims to be GNU too +#if defined(Q_CC_INTEL) // must be before GNU, Clang and MSVC because ICC/ICL claim to be them +# define COMPILER_STRING __VERSION__ /* __VERSION__ starts with "Intel(R) C++" */ +#elif defined(Q_CC_CLANG) // must be before GNU, because clang claims to be GNU too # ifdef __apple_build_version__ // Apple clang has other version numbers # define COMPILER_STRING "Clang " __clang_version__ " (Apple)" # else |