From 53b14384d57705fc7f0d07035e8af2bb8e556549 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Mon, 9 Aug 2010 15:32:02 +0200
Subject: [PATCH] Fix Build-/DeployConfiguration mixup
---
.../qt-s60/s60devicerunconfiguration.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 613930cedf6..c839fbe7bd4 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -49,9 +49,9 @@
#include <utils/qtcassert.h>
#include <utils/pathchooser.h>
#include <projectexplorer/buildsteplist.h>
+#include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/project.h>
-#include <projectexplorer/buildconfiguration.h>
#include <debugger/debuggerengine.h>
#include <debugger/debuggerplugin.h>
@@ -412,9 +412,9 @@ QString S60DeviceRunConfiguration::localExecutableFileName() const
bool S60DeviceRunConfiguration::runSmartInstaller() const
{
- BuildConfiguration *bc = target()->activeBuildConfiguration();
- QTC_ASSERT(bc, return false);
- BuildStepList *bsl = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
+ DeployConfiguration *dc = target()->activeDeployConfiguration();
+ QTC_ASSERT(dc, return false);
+ BuildStepList *bsl = dc->stepList();
QTC_ASSERT(bsl, return false);
QList<BuildStep *> steps = bsl->steps();
foreach (const BuildStep *step, steps) {
--
GitLab