forked from qt-creator/qt-creator
Maemo: Progress report also for debugging.
This commit is contained in:
@@ -134,6 +134,8 @@ void MaemoDebugSupport::handleAdapterSetupRequested()
|
|||||||
SLOT(handleSshError(QString)));
|
SLOT(handleSshError(QString)));
|
||||||
connect(m_runner, SIGNAL(readyForExecution()), this,
|
connect(m_runner, SIGNAL(readyForExecution()), this,
|
||||||
SLOT(startExecution()));
|
SLOT(startExecution()));
|
||||||
|
connect(m_runner, SIGNAL(reportProgress(QString)), this,
|
||||||
|
SLOT(handleProgressReport(QString)));
|
||||||
m_runner->start();
|
m_runner->start();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -256,9 +258,14 @@ void MaemoDebugSupport::handleRemoteErrorOutput(const QByteArray &output)
|
|||||||
m_runControl->showMessage(QString::fromUtf8(output), AppOutput);
|
m_runControl->showMessage(QString::fromUtf8(output), AppOutput);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MaemoDebugSupport::handleProgressReport(const QString &progressOutput)
|
||||||
|
{
|
||||||
|
m_runControl->showMessage(progressOutput, AppStuff);
|
||||||
|
}
|
||||||
|
|
||||||
void MaemoDebugSupport::stopSsh()
|
void MaemoDebugSupport::stopSsh()
|
||||||
{
|
{
|
||||||
disconnect(m_runner, 0, this, 0);
|
//disconnect(m_runner, 0, this, 0);
|
||||||
if (m_uploader) {
|
if (m_uploader) {
|
||||||
disconnect(m_uploader.data(), 0, this, 0);
|
disconnect(m_uploader.data(), 0, this, 0);
|
||||||
m_uploader->closeChannel();
|
m_uploader->closeChannel();
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ private slots:
|
|||||||
void handleDebuggingFinished();
|
void handleDebuggingFinished();
|
||||||
void handleRemoteOutput(const QByteArray &output);
|
void handleRemoteOutput(const QByteArray &output);
|
||||||
void handleRemoteErrorOutput(const QByteArray &output);
|
void handleRemoteErrorOutput(const QByteArray &output);
|
||||||
|
void handleProgressReport(const QString &progressOutput);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void stopSsh();
|
void stopSsh();
|
||||||
|
|||||||
@@ -129,6 +129,7 @@ void MaemoRemoteMounter::handleUnmountProcessFinished(int exitStatus)
|
|||||||
m_mountSpecs.clear();
|
m_mountSpecs.clear();
|
||||||
|
|
||||||
if (errorMsg.isEmpty()) {
|
if (errorMsg.isEmpty()) {
|
||||||
|
emit reportProgress(tr("Finished unmounting."));
|
||||||
emit unmounted();
|
emit unmounted();
|
||||||
} else {
|
} else {
|
||||||
if (!m_umountStderr.isEmpty()) {
|
if (!m_umountStderr.isEmpty()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user