diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-03-05 10:22:45 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-03-05 10:22:45 +0100 |
| commit | 0619de868110586e8a6561ecbc1d62c80da09501 (patch) | |
| tree | 1a4364a3660f57d5f10ac5a7471d30e3f555c5f4 /src/plugins/android/androidrunnerworker.cpp | |
| parent | 44886ad65a2226511a6b9a4383189e4ab804e47f (diff) | |
| parent | 26f6cbf8b59dffa7f47b315031b7055ec3421315 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/tools/clangpchmanagerbackend/source/taskscheduler.h
Change-Id: I518adaf647df412887c2a372416634359f09ad2a
Diffstat (limited to 'src/plugins/android/androidrunnerworker.cpp')
| -rw-r--r-- | src/plugins/android/androidrunnerworker.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 565ac17bac1..4b119642ec5 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -461,7 +461,7 @@ void AndroidRunnerWorker::asyncStartHelper() if (!m_gdbserverPath.isEmpty() && uploadGdbServer()) { gdbServerPrefix = "./"; } else { - emit remoteProcessFinished(tr("Cannot find/copy C++ debug server.")); + emit remoteProcessFinished(tr("Cannot find or copy C++ debug server.")); return; } } else { @@ -517,7 +517,7 @@ void AndroidRunnerWorker::asyncStartHelper() } if (!runAdb(args)) { - emit remoteProcessFinished(tr("Failed to start the activity")); + emit remoteProcessFinished(tr("Failed to start the activity.")); return; } } @@ -584,7 +584,7 @@ void AndroidRunnerWorker::handleJdbWaiting() runAdb(removeForward); if (!runAdb({"forward", "tcp:" + m_localJdbServerPort.toString(), "jdwp:" + QString::number(m_processPID)})) { - emit remoteProcessFinished(tr("Failed to forward jdb debugging ports.")); + emit remoteProcessFinished(tr("Failed to forward JDB debugging ports.")); return; } m_afterFinishAdbCommands.push_back(removeForward.join(' ')); @@ -603,7 +603,7 @@ void AndroidRunnerWorker::handleJdbWaiting() jdbProcess->setProcessChannelMode(QProcess::MergedChannels); jdbProcess->start(jdbPath.toString(), jdbArgs); if (!jdbProcess->waitForStarted()) { - emit remoteProcessFinished(tr("Failed to start jdb.")); + emit remoteProcessFinished(tr("Failed to start JDB.")); return; } m_jdbProcess = std::move(jdbProcess); @@ -643,7 +643,7 @@ void AndroidRunnerWorker::handleJdbSettled() } } } - emit remoteProcessFinished(tr("Cannot attach jdb to the running application")); + emit remoteProcessFinished(tr("Cannot attach JDB to the running application.")); } void AndroidRunnerWorker::onProcessIdChanged(qint64 pid) |