diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index fff94853e2d..24f57dcb4ac 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -271,5 +271,40 @@ void Qt4ProjectConfigWidget::qtVersionComboBoxCurrentIndexChanged(const QString
     if (newQtVersion != m_pro->qtVersionId(m_buildConfiguration)) {
         m_pro->setQtVersion(m_buildConfiguration, newQtVersion);
         m_pro->update();
+        updateToolChainCombo();
     }
 }
+
+void Qt4ProjectConfigWidget::updateToolChainCombo()
+{
+    m_ui->toolChainComboBox->clear();
+    QList<ProjectExplorer::ToolChain::ToolChainType> toolchains = m_pro->qtVersion(m_buildConfiguration)->possibleToolChainTypes();
+    foreach (ProjectExplorer::ToolChain::ToolChainType toolchain, toolchains) {
+        switch (toolchain) {
+        case ProjectExplorer::ToolChain::GCC:
+            m_ui->toolChainComboBox->addItem(tr("gcc"), ProjectExplorer::ToolChain::GCC);
+            break;
+        case ProjectExplorer::ToolChain::LinuxICC:
+            m_ui->toolChainComboBox->addItem(tr("icc"), ProjectExplorer::ToolChain::LinuxICC);
+            break;
+        case ProjectExplorer::ToolChain::MinGW:
+            m_ui->toolChainComboBox->addItem(tr("mingw"), ProjectExplorer::ToolChain::MinGW);
+            break;
+        case ProjectExplorer::ToolChain::MSVC:
+            m_ui->toolChainComboBox->addItem(tr("msvc"), ProjectExplorer::ToolChain::MSVC);
+            break;
+        case ProjectExplorer::ToolChain::WINCE:
+            m_ui->toolChainComboBox->addItem(tr("wince"), ProjectExplorer::ToolChain::WINCE);
+            break;
+#ifdef QTCREATOR_WITH_S60
+        case ProjectExplorer::ToolChain::WINSCW:
+            m_ui->toolChainComboBox->addItem(tr("winscw"), ProjectExplorer::ToolChain::WINSCW);
+            break;
+        case ProjectExplorer::ToolChain::GCCE:
+            m_ui->toolChainComboBox->addItem(tr("gcce"), ProjectExplorer::ToolChain::GCCE);
+            break;
+#endif
+        }
+    }
+    m_ui->toolChainComboBox->setEnabled(toolchains.size() > 1);
+}
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.h b/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
index 6e9c0fa00fb..2201d3f08ec 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
@@ -63,6 +63,7 @@ private slots:
     void manageQtVersions();
 
 private:
+    void updateToolChainCombo();
     void updateImportLabel();
     Ui::Qt4ProjectConfigWidget *m_ui;
     Qt4Project *m_pro;
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui b/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
index 07ef627d961..5f238cb4195 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
@@ -87,21 +87,21 @@
        </item>
       </layout>
      </item>
-     <item row="2" column="0">
+     <item row="3" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Shadow Build:</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
+     <item row="3" column="1">
       <widget class="QCheckBox" name="shadowBuildCheckBox">
        <property name="text">
         <string/>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
+     <item row="4" column="0">
       <widget class="QLabel" name="buildDirLabel">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -114,7 +114,7 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
+     <item row="5" column="1">
       <widget class="QLabel" name="importLabel">
        <property name="text">
         <string>&lt;a href=&quot;import&quot;&gt;Import existing build&lt;/a&gt;</string>
@@ -124,7 +124,7 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
+     <item row="4" column="1">
       <widget class="Core::Utils::PathChooser" name="shadowBuildDirEdit" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -134,6 +134,16 @@
        </property>
       </widget>
      </item>
+     <item row="2" column="1">
+      <widget class="QComboBox" name="toolChainComboBox"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Tool Chain:</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item row="0" column="1">