Commit 6bd2a473 authored by Daniel Teske's avatar Daniel Teske
Browse files

QMakeProject: Ensure that toolchain paths are last



Task-number: QTCREATORBUG-3959
Change-Id: Icba8cabe573557356aa634bb162367ce5b8bd582
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@digia.com>
parent 2ef08b75
......@@ -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);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment