From 66c2c7c18b5129b273e297bc81634bff46b8601f Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 10 Jun 2009 15:54:56 +0200
Subject: [PATCH] Add the environment from the right tool chain.
Since the actual tool chain is defined in the project, it
moved there from the qt version.
---
src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt | 8 +++++---
src/plugins/qt4projectmanager/qt4project.cpp | 1 +
src/plugins/qt4projectmanager/qtversionmanager.cpp | 8 ++------
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt b/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt
index afccc350c58..c643da4a4f9 100644
--- a/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt
+++ b/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt
@@ -1,6 +1,8 @@
-* When the refresh button in the SDK option page is pressed
- the qtoptionspage is not updated to reflect the new versions
- though we update them in S60Manager
+* SDK overview page:
+ * When the refresh button is pressed
+ the qtoptionspage is not updated to reflect the new versions
+ though we update them in S60Manager
+ * Qt auto-detection fails if no winscw-udeb Qt libs are installed
* QtVersion:
* support the different tool chains
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 48d4fec938a..b053bc86915 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -724,6 +724,7 @@ ProjectExplorer::Environment Qt4Project::baseEnvironment(const QString &buildCon
{
Environment env = useSystemEnvironment(buildConfiguration) ? Environment::systemEnvironment() : Environment();
qtVersion(buildConfiguration)->addToEnvironment(env);
+ toolChain(buildConfiguration)->addToEnvironment(env);
return env;
}
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index dd2b687f421..3431924fe1b 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1083,12 +1083,6 @@ void QtVersion::addToEnvironment(ProjectExplorer::Environment &env) const
env.set("QTDIR", m_path);
QString qtdirbin = versionInfo().value("QT_INSTALL_BINS");
env.prependOrSetPath(qtdirbin);
- // add libdir, includedir and bindir
- // or add Mingw dirs
- // or do nothing on other
- ProjectExplorer::ToolChain *tc = toolChain(defaultToolchainType());
- if (tc)
- tc->addToEnvironment(env);
}
int QtVersion::uniqueId() const
@@ -1195,7 +1189,9 @@ QString QtVersion::buildDebuggingHelperLibrary()
ProjectExplorer::Environment env = ProjectExplorer::Environment::systemEnvironment();
addToEnvironment(env);
+ // TODO: the debugging helper doesn't comply to actual tool chain yet
ProjectExplorer::ToolChain *tc = toolChain(defaultToolchainType());
+ tc->addToEnvironment(env);
QString directory = DebuggingHelperLibrary::copyDebuggingHelperLibrary(qtInstallData, path());
QString output = DebuggingHelperLibrary::buildDebuggingHelperLibrary(directory, tc->makeCommand(), qmakeCommand(), mkspec(), env);
m_hasDebuggingHelper = !debuggingHelperLibrary().isEmpty();
--
GitLab