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

QMakeProject: Ensure that toolchain paths are last

Browse Source 
Task-number: QTCREATORBUG-3959
Change-Id: Icba8cabe573557356aa634bb162367ce5b8bd582
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Daniel Teske
2014-03-31 11:28:56 +02:00
parent 2ef08b7580
commit 6bd2a47396
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -522,12 +522,6 @@ void QmakeProject::updateCppCodeModel()
else
part->qtVersion = ProjectPart::NoQt;
const QStringList cxxflags = pro->variableValue(CppFlagsVar);
part->evaluateToolchain(ToolChainKitInformation::toolChain(k),
cxxflags,
cxxflags,
SysRootKitInformation::sysRoot(k));
// part->defines
part->projectDefines += pro->cxxDefines();
@@ -582,6 +576,12 @@ void QmakeProject::updateCppCodeModel()
part->files << ProjectFile(file, ProjectFile::ObjCXXHeader);
}
const QStringList cxxflags = pro->variableValue(CppFlagsVar);
part->evaluateToolchain(ToolChainKitInformation::toolChain(k),
cxxflags,
cxxflags,
SysRootKitInformation::sysRoot(k));
pinfo.appendProjectPart(part);
}