Fix windows build.

src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp

@@ -43,6 +43,8 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/persistentsettings.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/persistentsettings.h>
 
 #include <debugger/debuggermanager.h>
 
@@ -246,7 +248,8 @@ void S60DeviceRunConfiguration::updateTarget()
 
     // Find out what flags we pass on to qmake, this code is duplicated in the qmake step
     QtVersion::QmakeBuildConfig defaultBuildConfiguration = qtVersion->defaultBuildConfig();
-    QtVersion::QmakeBuildConfig projectBuildConfiguration = QtVersion::QmakeBuildConfig(pro->value(pro->activeBuildConfiguration(), "buildConfiguration").toInt());
+    QtVersion::QmakeBuildConfig projectBuildConfiguration = QtVersion::QmakeBuildConfig(pro->activeBuildConfiguration()
+                                                                                        ->value("buildConfiguration").toInt());
     QStringList addedUserConfigArguments;
     QStringList removedUserConfigArguments;
     if ((defaultBuildConfiguration & QtVersion::BuildAll) && !(projectBuildConfiguration & QtVersion::BuildAll))

src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp

@@ -124,7 +124,8 @@ void S60EmulatorRunConfiguration::updateTarget()
 
     // Find out what flags we pass on to qmake, this code is duplicated in the qmake step
     QtVersion::QmakeBuildConfig defaultBuildConfiguration = qtVersion->defaultBuildConfig();
-    QtVersion::QmakeBuildConfig projectBuildConfiguration = QtVersion::QmakeBuildConfig(pro->value(pro->activeBuildConfiguration(), "buildConfiguration").toInt());
+    QtVersion::QmakeBuildConfig projectBuildConfiguration = QtVersion::QmakeBuildConfig(pro->activeBuildConfiguration()
+                                                                                        ->value("buildConfiguration").toInt());
     QStringList addedUserConfigArguments;
     QStringList removedUserConfigArguments;
     if ((defaultBuildConfiguration & QtVersion::BuildAll) && !(projectBuildConfiguration & QtVersion::BuildAll))

src/plugins/qt4projectmanager/qt4project.cpp

@@ -481,11 +481,11 @@ QString Qt4Project::makeCommand(BuildConfiguration *configuration) const
 QString Qt4Project::defaultMakeTarget(BuildConfiguration *configuration) const
 {
 #ifdef QTCREATOR_WITH_S60
-    ToolChain *tc = toolChain(buildConfiguration);
+    ToolChain *tc = toolChain(configuration);
     if (!tc)
         return QString::null;
     QtVersion::QmakeBuildConfig buildConfig
-            = QtVersion::QmakeBuildConfig(value(activeBuildConfiguration(), "buildConfiguration").toInt());
+            = QtVersion::QmakeBuildConfig(activeBuildConfiguration()->value("buildConfiguration").toInt());
 
     if (tc->type() == ToolChain::GCCE) {
         if (!(buildConfig & QtVersion::DebugBuild)) {