diff --git a/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt b/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt
index 7cb884736202c9f35dc04d44997f5ef18fa29958..846f57c86dd615bed52e2dd5fe4d9fd3b833f592 100644
--- a/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt
+++ b/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt
@@ -5,7 +5,6 @@
     * Qt auto-detection fails if no winscw-udeb Qt libs are installed
 
 * QtVersion:
-    * support the different tool chains
     * gui for overriding the default make target if necessary,
       make arguments --> make options
     * more general "debug / release" configuration to be used in toolchain???
@@ -15,8 +14,8 @@
       of ToolChain::defaultMakeTarget then as well
     * build parser should be defined/created by toolchain, not make step
 
-* Tool chains:
-    * changing tool chain does not reindex (changed includes+defines)
+* Debugging helpers
+    * must probably be compiled for different toolchains
 
 * WINSCW tool chain:
     * predefined macros
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 2fa595dd3db17c7324205c8205f5cc6af89b6495..7e75e1ae0f3843acea9ea5e997fab8cd7ee6a5c4 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -274,8 +274,8 @@ void Qt4ProjectConfigWidget::qtVersionComboBoxCurrentIndexChanged(const QString
     m_ui->invalidQtWarningLabel->setVisible(!isValid);
     if (newQtVersion != m_pro->qtVersionId(m_buildConfiguration)) {
         m_pro->setQtVersion(m_buildConfiguration, newQtVersion);
-        m_pro->update();
         updateToolChainCombo();
+        m_pro->update();
     }
 }
 
@@ -311,13 +311,22 @@ void Qt4ProjectConfigWidget::updateToolChainCombo()
         }
     }
     m_ui->toolChainComboBox->setEnabled(toolchains.size() > 1);
-    selectToolChain(toolchains.indexOf(m_pro->toolChainType(m_buildConfiguration)));
+    setToolChain(toolchains.indexOf(m_pro->toolChainType(m_buildConfiguration)));
 }
 
 void Qt4ProjectConfigWidget::selectToolChain(int index)
 {
+    setToolChain(index);
+    m_pro->update();
+}
+
+void Qt4ProjectConfigWidget::setToolChain(int index)
+{
+    ProjectExplorer::ToolChain::ToolChainType selectedToolChainType =
+        m_ui->toolChainComboBox->itemData(index,
+            Qt::UserRole).value<ProjectExplorer::ToolChain::ToolChainType>();
     m_pro->setToolChainType(m_buildConfiguration, m_ui->toolChainComboBox->itemData(index,
-        Qt::UserRole).value<ProjectExplorer::ToolChain::ToolChainType>());
+            Qt::UserRole).value<ProjectExplorer::ToolChain::ToolChainType>());
     if (m_ui->toolChainComboBox->currentIndex() != index)
         m_ui->toolChainComboBox->setCurrentIndex(index);
 }
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.h b/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
index c9864049418bc6ebdcd5b79661c92396800c93fa..a892299c1afa7ce0cdeb0741c68a8fb58445f1fe 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
@@ -66,6 +66,7 @@ private slots:
 private:
     void updateToolChainCombo();
     void updateImportLabel();
+    void setToolChain(int index);
     Ui::Qt4ProjectConfigWidget *m_ui;
     Qt4Project *m_pro;
     QString m_buildConfiguration;