Commit 867d6552 authored by Daniel Teske's avatar Daniel Teske Committed by Oswald Buddenhagen
Browse files

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



They might differ if the user passes any -spec parameter

Change-Id: I9408541a09a6a687fdbae879bd1ab4c92e62aa1e
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@nokia.com>
parent 9e5c6518
......@@ -1914,7 +1914,7 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
// update TargetInformation
m_qt4targetInformation = targetInformation(m_readerExact);
m_resolvedMkspecPath = m_project->qmakeGlobals()->qmakespec;
m_resolvedMkspecPath = m_readerExact->resolvedMkSpec();
m_subProjectsNotToDeploy = subProjectsNotToDeploy;
setupInstallsList(m_readerExact);
......
......@@ -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));
......
......@@ -203,6 +203,11 @@ QString ProFileEvaluator::propertyValue(const QString &name) const
return d->m_option->propertyValue(ProKey(name)).toQString();
}
QString ProFileEvaluator::resolvedMkSpec() const
{
return d->m_qmakespecFull;
}
#ifdef PROEVALUATOR_CUMULATIVE
void ProFileEvaluator::setCumulative(bool on)
{
......
......@@ -83,6 +83,8 @@ public:
const ProFile *pro) const;
QString propertyValue(const QString &val) const;
QString resolvedMkSpec() const;
private:
QString sysrootify(const QString &path, const QString &baseDir) const;
......
Markdown is supported
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