diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp index 652dc983bba84a16477bdbb6be2c95c83e92a5ec..8958d5686e0ef04b66e0151c3a66312320c63352 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp @@ -770,7 +770,6 @@ S60DeviceDebugRunControl::S60DeviceDebugRunControl(S60DeviceRunConfiguration *rc arg(localExecutable(rc)); emit appendMessage(this, msg, true); } - connect(this, SIGNAL(finished()), this, SLOT(slotFinished())); } void S60DeviceDebugRunControl::start() @@ -787,13 +786,6 @@ void S60DeviceDebugRunControl::start() settingsCategory, settingsPage); return; } - m_debugProgress.reset(new QFutureInterface<void>); - Core::ICore::instance()->progressManager()->addTask(m_debugProgress->future(), - tr("Debugging"), - QLatin1String("Symbian.Debug")); - m_debugProgress->setProgressRange(0, PROGRESS_MAX); - m_debugProgress->setProgressValue(0); - m_debugProgress->reportStarted(); emit appendMessage(this, tr("Launching debugger..."), false); Debugger::DebuggerRunControl::start(); @@ -802,21 +794,3 @@ void S60DeviceDebugRunControl::start() S60DeviceDebugRunControl::~S60DeviceDebugRunControl() { } - -RunControl::StopResult S60DeviceDebugRunControl::stop() -{ - if (!m_debugProgress.isNull()) { - m_debugProgress->reportCanceled(); - m_debugProgress.reset(); - } - return Debugger::DebuggerRunControl::stop(); -} - -void S60DeviceDebugRunControl::slotFinished() -{ - if (!m_debugProgress.isNull()) { - m_debugProgress->setProgressValue(PROGRESS_MAX); - m_debugProgress->reportFinished(); - m_debugProgress.reset(); - } -} diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h index 985c2066c54eec8c9be7b338ca1bf2635ee3626f..bee69b71ecddee6e758e63cd4bec2aba162b51c3 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h @@ -204,15 +204,9 @@ public: const QString &mode); virtual ~S60DeviceDebugRunControl(); virtual void start(); - virtual StopResult stop(); - -private slots: - void slotFinished(); private: static Debugger::DebuggerStartParameters s60DebuggerStartParams(const S60DeviceRunConfiguration *rc); - - QScopedPointer<QFutureInterface<void> > m_debugProgress; }; } // namespace Internal