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

Small cleanup for Symbian's RunConfiguration

Browse Source
This commit is contained in:
Pawel Polanski
2010-08-03 15:07:26 +02:00
parent d7164a01d1
commit d654612cfb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -603,8 +603,8 @@ void S60DeviceRunControlBase::start()
{ {
m_deployProgress = new QFutureInterface<void>; m_deployProgress = new QFutureInterface<void>;
Core::ICore::instance()->progressManager()->addTask(m_deployProgress->future(), Core::ICore::instance()->progressManager()->addTask(m_deployProgress->future(),
tr("Deploying"), tr("Launching"),
QLatin1String("Symbian.Deploy")); QLatin1String("Symbian.Launch"));
m_deployProgress->setProgressRange(0, PROGRESS_MAX); m_deployProgress->setProgressRange(0, PROGRESS_MAX);
m_deployProgress->setProgressValue(0); m_deployProgress->setProgressValue(0);
m_deployProgress->reportStarted(); m_deployProgress->reportStarted();
@@ -631,7 +631,7 @@ void S60DeviceRunControlBase::start()
return; return;
} }
startDeployment(); startLaunching();
} }
static inline void stopProcess(QProcess *p) static inline void stopProcess(QProcess *p)
@@ -657,7 +657,7 @@ bool S60DeviceRunControlBase::isRunning() const
return false; return false;
} }
void S60DeviceRunControlBase::startDeployment() void S60DeviceRunControlBase::startLaunching()
{ {
QString errorMessage; QString errorMessage;
bool success = false; bool success = false;

2
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
View File

@@ -193,7 +193,7 @@ private slots:
void reportDeployFinished(); void reportDeployFinished();
private: private:
void startDeployment(); void startLaunching();
ProjectExplorer::ToolChain::ToolChainType m_toolChain; ProjectExplorer::ToolChain::ToolChainType m_toolChain;
QString m_serialPortName; QString m_serialPortName;