AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add detection for the Intel compiler in QLibraryInfo::build()

Browse Source 
Change-Id: I26ed74ac963226abc42d50c0edac6ce9a1c0fd23
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Thiago Macieira 2014-03-22 23:42:12 -07:00 committed by The Qt Project
parent 790bc92bc0
commit d041ae30d6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/global/qlibraryinfo.cpp
View File

@ -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