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

Qt4Project CodeModel: Use the project's mkspec not the qtversion's

Browse Source 
They might differ if the user passes any -spec parameter

Change-Id: I9408541a09a6a687fdbae879bd1ab4c92e62aa1e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Daniel Teske
2012-09-04 11:41:32 +02:00
committed by Oswald Buddenhagen
parent 9e5c6518c0
commit 867d655278
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -542,8 +542,10 @@ void Qt4Project::updateCppCodeModel()
if (qtVersion) {
if (!qtVersion->frameworkInstallPath().isEmpty())
part->frameworkPaths.append(qtVersion->frameworkInstallPath());
part->includePaths.append(qtVersion->mkspecPath().toString());
}
if (Qt4ProFileNode *node = rootQt4ProjectNode())
part->includePaths.append(node->resolvedMkspecPath());
// part->precompiledHeaders
part->precompiledHeaders.append(pro->variableValue(PrecompiledHeaderVar));