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

Android: Fix UI text

Browse Source 
Change-Id: I918ded69e64ec3f91d7deeda086d36c6b73fdf8d
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Leena Miettinen
2019-03-01 17:10:38 +01:00
parent 1825a05f58
commit 031a82cd71
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -461,7 +461,7 @@ void AndroidRunnerWorker::asyncStartHelper()
if (!m_gdbserverPath.isEmpty() && uploadGdbServer()) { if (!m_gdbserverPath.isEmpty() && uploadGdbServer()) {
gdbServerPrefix = "./"; gdbServerPrefix = "./";
} else { } else {
emit remoteProcessFinished(tr("Cannot find/copy C++ debug server.")); emit remoteProcessFinished(tr("Cannot find or copy C++ debug server."));
return; return;
} }
} else { } else {
@@ -517,7 +517,7 @@ void AndroidRunnerWorker::asyncStartHelper()
} }
if (!runAdb(args)) { if (!runAdb(args)) {
emit remoteProcessFinished(tr("Failed to start the activity")); emit remoteProcessFinished(tr("Failed to start the activity."));
return; return;
} }
} }
@@ -584,7 +584,7 @@ void AndroidRunnerWorker::handleJdbWaiting()
runAdb(removeForward); runAdb(removeForward);
if (!runAdb({"forward", "tcp:" + m_localJdbServerPort.toString(), if (!runAdb({"forward", "tcp:" + m_localJdbServerPort.toString(),
"jdwp:" + QString::number(m_processPID)})) { "jdwp:" + QString::number(m_processPID)})) {
emit remoteProcessFinished(tr("Failed to forward jdb debugging ports.")); emit remoteProcessFinished(tr("Failed to forward JDB debugging ports."));
return; return;
} }
m_afterFinishAdbCommands.push_back(removeForward.join(' ')); m_afterFinishAdbCommands.push_back(removeForward.join(' '));
@@ -603,7 +603,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);
@@ -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) void AndroidRunnerWorker::onProcessIdChanged(qint64 pid)