feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Sort known predefined macros for MSVC

Browse Source 
Change-Id: Ife28880b06078e2cd0e39a44ce4ca0ca3546b935
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-03-14 10:44:13 +01:00
parent 388086211a
commit 3a679ea173
1 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -260,22 +260,55 @@ static QString generateDisplayName(const QString &name,
static QByteArray msvcCompilationFile() static QByteArray msvcCompilationFile()
{ {
static const char* macros[] = {"_ATL_VER", "_CHAR_UNSIGNED", "__CLR_VER", static const char* macros[] = {
"__cplusplus_cli", "__COUNTER__", "__cplusplus", "_ATL_VER",
"_CPPLIB_VER", "_CPPRTTI", "_CPPUNWIND", "_CHAR_UNSIGNED",
"_DEBUG", "_DLL", "__FUNCDNAME__", "__CLR_VER",
"__FUNCSIG__", "__FUNCTION__", "_INTEGRAL_MAX_BITS", "__COUNTER__",
"_M_ALPHA", "_M_AAMD64", "_M_CEE", "_M_CEE_PURE", "__cplusplus",
"_M_CEE_SAFE", "_M_IX86", "_M_IA64", "__cplusplus_cli",
"_M_IX86_FP", "_M_MPPC", "_M_MRX000", "_CPPLIB_VER",
"_M_PPC", "_M_X64", "_MANAGED", "_CPPRTTI",
"_MFC_VER", "_MSC_BUILD", "_MSC_EXTENSIONS", "_CPPUNWIND",
"_MSC_FULL_VER", "_MSC_VER", "__MSVC_RUNTIME_CHECKS", "__DATE__",
"_MT", "_NATIVE_WCHAR_T_DEFINED", "_OPENMP", "_DEBUG",
"_VC_NODEFAULTLIB", "_WCHAR_T_DEFINED", "_WIN32", "_DLL",
"_WIN32_WCE", "_WIN64", "_Wp64", "__FUNCDNAME__",
"__DATE__", "__TIME__", "__TIMESTAMP__", "__FUNCSIG__",
0}; "__FUNCTION__",
"_INTEGRAL_MAX_BITS",
"_M_AAMD64",
"_M_ALPHA",
"_MANAGED",
"_M_CEE",
"_M_CEE_PURE",
"_M_CEE_SAFE",
"_MFC_VER",
"_M_IA64",
"_M_IX86",
"_M_IX86_FP",
"_M_MPPC",
"_M_MRX000",
"_M_PPC",
"_MSC_BUILD",
"_MSC_EXTENSIONS",
"_MSC_FULL_VER",
"_MSC_VER",
"__MSVC_RUNTIME_CHECKS",
"_MT",
"_M_X64",
"_NATIVE_WCHAR_T_DEFINED",
"_OPENMP",
"__TIME__",
"__TIMESTAMP__",
"_VC_NODEFAULTLIB",
"_WCHAR_T_DEFINED",
"_WIN32",
"_WIN32_WCE",
"_WIN64",
"_Wp64",
0
};
QByteArray file = "#define __PPOUT__(x) V##x=x\n\n"; QByteArray file = "#define __PPOUT__(x) V##x=x\n\n";
for (int i = 0; macros[i] != 0; ++i) { for (int i = 0; macros[i] != 0; ++i) {
const QByteArray macro(macros[i]); const QByteArray macro(macros[i]);