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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Change-Id: I762dbddb0f337e9a5fc4b113c7876813e9f45c9c
This commit is contained in:
Eike Ziller
2018-06-11 16:01:18 +02:00
parent 168e89e0a2 4cba1d7c71
commit 9b43b55dc0
62 changed files with 519 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,7 +390,7 @@ void AndroidRunnerWorker::asyncStartHelper()
}
if (gdbServerExecutable.isEmpty()) {
emit remoteProcessFinished(tr("Can't find C++ debugger."));
emit remoteProcessFinished(tr("Cannot find C++ debugger."));
return;
}
@@ -495,7 +495,7 @@ void AndroidRunnerWorker::handleJdbWaiting()
QString("com.sun.jdi.SocketAttach:hostname=localhost,port=%1")
.arg(m_localJdbServerPort.toString()));
if (!jdbProcess->waitForStarted()) {
emit remoteProcessFinished(tr("Failed to start JDB"));
emit remoteProcessFinished(tr("Failed to start jdb"));
return;
}
m_jdbProcess = std::move(jdbProcess);
@@ -531,7 +531,7 @@ void AndroidRunnerWorker::handleJdbSettled()
}
}
}
emit remoteProcessFinished(tr("Can't attach jdb to the running application").arg(m_lastRunAdbError));
emit remoteProcessFinished(tr("Cannot attach jdb to the running application").arg(m_lastRunAdbError));
}
void AndroidRunnerWorker::onProcessIdChanged(qint64 pid)