From 4252836b4d653d40d1a3aa7aea6134857c3463a0 Mon Sep 17 00:00:00 2001 From: con <qtc-committer@nokia.com> Date: Thu, 1 Oct 2009 09:56:02 +0200 Subject: [PATCH] Fix windows build. --- .../qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp | 5 ++++- .../qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp | 3 ++- src/plugins/qt4projectmanager/qt4project.cpp | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp index 699d4eaa3ac..757bde525f5 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp +++ b/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)) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp index 0e0fdb46811..0452246638f 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp +++ b/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)) diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index a25f505dae0..a2918a0dc22 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/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)) { -- GitLab