From 7df5226e42ef1991110a41d50ece908bfe07d637 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Thu, 22 Oct 2009 16:27:47 +0200
Subject: [PATCH] Fixes Maemo after Toolchain refactoring
Reviewed-by: dt <qtc-committer@nokia.com>
---
src/plugins/qt4projectmanager/profilereader.cpp | 3 ++-
src/plugins/qt4projectmanager/profilereader.h | 2 +-
src/plugins/qt4projectmanager/qtversionmanager.cpp | 6 +-----
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qt4projectmanager/profilereader.cpp b/src/plugins/qt4projectmanager/profilereader.cpp
index 333f43ff27a..826f44c469e 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 2640b806060..09782a0b38d 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 51298b69f70..f6c7f183faa 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
--
GitLab