Fixes Maemo after Toolchain refactoring

Reviewed-by: dt <qtc-committer@nokia.com>

3 files changed, 4 insertions, 7 deletions

diff --git a/src/plugins/qt4projectmanager/profilereader.cpp b/src/plugins/qt4projectmanager/profilereader.cpp
index 333f43ff27..826f44c469 100644
--- a/src/plugins/qt4projectmanager/profilereader.cpp
+++ b/src/plugins/qt4projectmanager/profilereader.cpp
@@ -45,7 +45,8 @@ ProFileReader::~ProFileReader()
         delete pf;
 }
 
-void ProFileReader::setQtVersion(QtVersion *qtVersion) {
+void ProFileReader::setQtVersion(const QtVersion *qtVersion)
+{
     if (qtVersion)
         m_option.properties = qtVersion->versionInfo();
     else
diff --git a/src/plugins/qt4projectmanager/profilereader.h b/src/plugins/qt4projectmanager/profilereader.h
index 2640b80606..09782a0b38 100644
--- a/src/plugins/qt4projectmanager/profilereader.h
+++ b/src/plugins/qt4projectmanager/profilereader.h
@@ -47,7 +47,7 @@ public:
     ProFileReader();
     ~ProFileReader();
 
-    void setQtVersion(QtVersion *qtVersion);
+    void setQtVersion(const QtVersion *qtVersion);
     bool readProFile(const QString &fileName);
     QList<ProFile*> includeFiles() const;
 
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 51298b69f7..f6c7f183fa 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1099,6 +1099,7 @@ void QtVersion::updateToolChain() const
         mkspecPath = mkspecPath + "/default";
 
     ProFileReader *reader = new ProFileReader();
+    reader->setQtVersion(this);
     reader->setCumulative(false);
     reader->setParsePreAndPostFiles(false);
     reader->readProFile(mkspecPath + "/qmake.conf");
@@ -1120,11 +1121,6 @@ void QtVersion::updateToolChain() const
     } else if (qt_arch == "arm") {
 #ifdef QTCREATOR_WITH_MAEMO
         m_toolChains << MaemoManager::instance()->maemoToolChain(this);
-
-        ProjectExplorer::Environment env = ProjectExplorer::Environment::systemEnvironment();
-        //addToEnvironment(env);
-        qmakeCXX = env.searchInPath(qmakeCXX);
-        m_toolChains << ProjectExplorer::ToolChain::createGccToolChain(qmakeCXX);
 #endif
     } else if (qmakeCXX == "cl" || qmakeCXX == "icl") {
         // TODO proper support for intel cl