forked from qt-creator/qt-creator
Debug progress bar removed form Symbian debugging
Task-number: QTCREATORBUG-2846
This commit is contained in:
@@ -770,7 +770,6 @@ S60DeviceDebugRunControl::S60DeviceDebugRunControl(S60DeviceRunConfiguration *rc
|
|||||||
arg(localExecutable(rc));
|
arg(localExecutable(rc));
|
||||||
emit appendMessage(this, msg, true);
|
emit appendMessage(this, msg, true);
|
||||||
}
|
}
|
||||||
connect(this, SIGNAL(finished()), this, SLOT(slotFinished()));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void S60DeviceDebugRunControl::start()
|
void S60DeviceDebugRunControl::start()
|
||||||
@@ -787,13 +786,6 @@ void S60DeviceDebugRunControl::start()
|
|||||||
settingsCategory, settingsPage);
|
settingsCategory, settingsPage);
|
||||||
return;
|
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);
|
emit appendMessage(this, tr("Launching debugger..."), false);
|
||||||
Debugger::DebuggerRunControl::start();
|
Debugger::DebuggerRunControl::start();
|
||||||
@@ -802,21 +794,3 @@ void S60DeviceDebugRunControl::start()
|
|||||||
S60DeviceDebugRunControl::~S60DeviceDebugRunControl()
|
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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -204,15 +204,9 @@ public:
|
|||||||
const QString &mode);
|
const QString &mode);
|
||||||
virtual ~S60DeviceDebugRunControl();
|
virtual ~S60DeviceDebugRunControl();
|
||||||
virtual void start();
|
virtual void start();
|
||||||
virtual StopResult stop();
|
|
||||||
|
|
||||||
private slots:
|
|
||||||
void slotFinished();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static Debugger::DebuggerStartParameters s60DebuggerStartParams(const S60DeviceRunConfiguration *rc);
|
static Debugger::DebuggerStartParameters s60DebuggerStartParams(const S60DeviceRunConfiguration *rc);
|
||||||
|
|
||||||
QScopedPointer<QFutureInterface<void> > m_debugProgress;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Internal
|
} // namespace Internal
|
||||||
|
|||||||
Reference in New Issue
Block a user