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

Android: Fix error messages

Browse Source 
Change-Id: Ib7f996d65d5d50b1c7cbea399bccc1c87ba0e9e6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Robert Loehning
2018-07-13 15:25:38 +02:00
parent 2410443237
commit 4d85b6fc7e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidrunnerworker.cpp
View File

@@ -520,7 +520,7 @@ void AndroidRunnerWorker::handleJdbWaiting()
jdbProcess->setProcessChannelMode(QProcess::MergedChannels); jdbProcess->setProcessChannelMode(QProcess::MergedChannels);
jdbProcess->start(jdbPath.toString(), jdbArgs); jdbProcess->start(jdbPath.toString(), jdbArgs);
if (!jdbProcess->waitForStarted()) { if (!jdbProcess->waitForStarted()) {
emit remoteProcessFinished(tr("Failed to start jdb")); emit remoteProcessFinished(tr("Failed to start jdb."));
return; return;
} }
m_jdbProcess = std::move(jdbProcess); m_jdbProcess = std::move(jdbProcess);
@@ -560,7 +560,8 @@ void AndroidRunnerWorker::handleJdbSettled()
} }
} }
} }
emit remoteProcessFinished(tr("Cannot attach jdb to the running application").arg(m_lastRunAdbError)); emit remoteProcessFinished(tr("Cannot attach jdb to the running application. Reason: %1.")
.arg(m_lastRunAdbError));
} }
void AndroidRunnerWorker::onProcessIdChanged(qint64 pid) void AndroidRunnerWorker::onProcessIdChanged(qint64 pid)