From 6bd2a473966512b00a8893cef72a530359bbf138 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Mon, 31 Mar 2014 11:28:56 +0200 Subject: [PATCH] QMakeProject: Ensure that toolchain paths are last Task-number: QTCREATORBUG-3959 Change-Id: Icba8cabe573557356aa634bb162367ce5b8bd582 Reviewed-by: Nikolai Kosjar --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index a2285a0065c..bc0bee6b8d3 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -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); }