diff --git a/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt b/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt
index afccc350c589ae290c8f23361f323598a321815a..c643da4a4f994a6d0b674fa8f04b5f663c9482e0 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 48d4fec938a4f6982f9e960140f705d3d4419e7c..b053bc869156199f34f5a2c2bd8a5cff805c35e6 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 dd2b687f421c9d0810e2db857c43fad7a6f5d7ac..3431924fe1bdb5c8cbf3daeb5b915cbe4e62aa77 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();