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

Add /FS to cpp.platformC(xx)Flags for MSVC2013

Browse Source 
Task-number: QTCREATORBUG-11025
Change-Id: Ibdfebc601a38535aae353a0ed2aedac920d5b192
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Yuchen Deng
2014-04-18 10:00:52 +08:00
committed by Joerg Bornemann
parent c922887315
commit 3cb00e1afe
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
View File

@@ -118,6 +118,11 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, c
Utils::FileName cxx = tc->compilerCommand(); Utils::FileName cxx = tc->compilerCommand();
data.insert(QLatin1String(CPP_TOOLCHAINPATH), cxx.toFileInfo().absolutePath()); data.insert(QLatin1String(CPP_TOOLCHAINPATH), cxx.toFileInfo().absolutePath());
data.insert(QLatin1String(CPP_COMPILERNAME), cxx.toFileInfo().fileName()); data.insert(QLatin1String(CPP_COMPILERNAME), cxx.toFileInfo().fileName());
if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor) {
const QLatin1String flags("/FS");
data.insert(QLatin1String(CPP_PLATFORMCFLAGS), flags);
data.insert(QLatin1String(CPP_PLATFORMCXXFLAGS), flags);
}
} }
return data; return data;
} }

2
src/plugins/qbsprojectmanager/qbsconstants.h
View File

@@ -41,6 +41,8 @@ const char QBS_ENDIANNESS[] = "qbs.endianness";
const char QBS_TOOLCHAIN[] = "qbs.toolchain"; const char QBS_TOOLCHAIN[] = "qbs.toolchain";
const char CPP_TOOLCHAINPATH[] = "cpp.toolchainInstallPath"; const char CPP_TOOLCHAINPATH[] = "cpp.toolchainInstallPath";
const char CPP_COMPILERNAME[] = "cpp.compilerName"; const char CPP_COMPILERNAME[] = "cpp.compilerName";
const char CPP_PLATFORMCFLAGS[] = "cpp.platformCFlags";
const char CPP_PLATFORMCXXFLAGS[] = "cpp.platformCxxFlags";
} // namespace Constants } // namespace Constants
} // namespace QbsProjectManager } // namespace QbsProjectManager