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: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

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);

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));

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)
 {

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;