diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 4f04f945a06..266137d3f0a 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -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); diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index 67251b95c06..efdbcd43c19 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -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)); diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index 6e1ad8af863..0008656d31a 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -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) { diff --git a/src/shared/proparser/profileevaluator.h b/src/shared/proparser/profileevaluator.h index 3d6f9179113..d4429ba54d7 100644 --- a/src/shared/proparser/profileevaluator.h +++ b/src/shared/proparser/profileevaluator.h @@ -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;