Results of review.

Tool chain type is saved in settings, make sure that the value doesn't
change between S60 enabled/disabled Qt Creator version.
Run configurations can change independent from the run settings
property page, re-add handling of signals.
Add some things to consider to the todo list.

Reviewed-by: dt

src/plugins/projectexplorer/runsettingspropertiespage.cpp

@@ -194,6 +194,11 @@ RunSettingsWidget::RunSettingsWidget(Project *project)
     connect(m_ui->removeToolButton, SIGNAL(clicked(bool)),
             this, SLOT(removeRunConfiguration()));
 
+    connect(m_project, SIGNAL(removedRunConfiguration(QString)),
+            this, SLOT(initRunConfigurationComboBox()));
+    connect(m_project, SIGNAL(addedRunConfiguration(QString)),
+            this, SLOT(initRunConfigurationComboBox()));
+
     connect(m_project, SIGNAL(activeRunConfigurationChanged()),
             this, SLOT(activeRunConfigurationChanged()));
     connect(m_project, SIGNAL(runConfigurationsEnabledStateChanged()),

src/plugins/projectexplorer/toolchain.h

@@ -69,18 +69,18 @@ class PROJECTEXPLORER_EXPORT ToolChain
 public:
     enum ToolChainType
     {
-        GCC,
-        LinuxICC,
-        MinGW,
-        MSVC,
-        WINCE,
+        GCC = 0,
+        LinuxICC = 1,
+        MinGW = 2,
+        MSVC = 3,
+        WINCE = 4,
 #ifdef QTCREATOR_WITH_S60
-        WINSCW,
-        GCCE,
+        WINSCW = 5,
+        GCCE = 6,
 #endif
-        OTHER,
-        UNKNOWN,
-        INVALID
+        OTHER = 200,
+        UNKNOWN = 201,
+        INVALID = 202
     };
 
     virtual QByteArray predefinedMacros() = 0;

src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt

@@ -12,15 +12,29 @@
 * Debugging helpers
     * must probably be compiled for different toolchains
 
+* Tool chains
+    * derive GCCE tool chain from GCC toolchain to get the includes/defines
+      implementation
+    * delete toolchain in more intelligent way (create a new one and
+      check if it's the same as the old one, has the advantage that
+      cached data doesn't need to be retrieved again)
+    * Qt4Project::setQtVersion should think about tool chains,
+      might be better to remove the magic in toolChainType method
+    * should the default make target be defined by the project
+      instead of tool chain, or perhaps by the QtVersion dependent on a
+      tool chain?
+
 * Run Configurations
     * handling of active run config getting disabled not optimal yet
+    * might be better from a user perspective if the run configuration
+      defines possible tool chains
 
 * Run on device
     * makesis, signsis and applicationinstaller don't report errors back
       via exit code :-(
     * passphrase for signing
 
-* Add compile output parser winscw at least!
+* Add compile output parser winscw at least
 
 * WINSCW tool chain:
     * predefined macros