feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix Build-/DeployConfiguration mixup

Browse Source
This commit is contained in:
Tobias Hunger
2010-08-09 15:32:02 +02:00
parent 0d35f2f7bc
commit 53b14384d5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -49,9 +49,9 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/buildconfiguration.h>
#include <debugger/debuggerengine.h> #include <debugger/debuggerengine.h>
#include <debugger/debuggerplugin.h> #include <debugger/debuggerplugin.h>
@@ -412,9 +412,9 @@ QString S60DeviceRunConfiguration::localExecutableFileName() const
bool S60DeviceRunConfiguration::runSmartInstaller() const bool S60DeviceRunConfiguration::runSmartInstaller() const
{ {
BuildConfiguration *bc = target()->activeBuildConfiguration(); DeployConfiguration *dc = target()->activeDeployConfiguration();
QTC_ASSERT(bc, return false); QTC_ASSERT(dc, return false);
BuildStepList *bsl = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY); BuildStepList *bsl = dc->stepList();
QTC_ASSERT(bsl, return false); QTC_ASSERT(bsl, return false);
QList<BuildStep *> steps = bsl->steps(); QList<BuildStep *> steps = bsl->steps();
foreach (const BuildStep *step, steps) { foreach (const BuildStep *step, steps) {