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

Merge remote-tracking branch 'origin/13.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/plugins/cppeditor/cppcodemodelsettings.cpp
	src/plugins/cppeditor/cppcodemodelsettings.h

Change-Id: I54937c39b06897a72a105e4e0a8b5f8a76c38e26
This commit is contained in:
Eike Ziller
2024-03-06 15:10:15 +01:00
parent db5ac2dc15 7b8f274b9e
commit 8abc95331f
151 changed files with 4134 additions and 1934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -754,6 +754,7 @@ void AndroidRunnerWorker::handleJdbWaiting()
m_jdbProcess->setProcessChannelMode(QProcess::MergedChannels);
m_jdbProcess->setCommand({jdbPath, jdbArgs});
m_jdbProcess->setReaperTimeout(s_jdbTimeout);
m_jdbProcess->setProcessMode(ProcessMode::Writer);
m_jdbProcess->start();
if (!m_jdbProcess->waitForStarted()) {
emit remoteProcessFinished(Tr::tr("Failed to start JDB."));
@@ -770,6 +771,7 @@ void AndroidRunnerWorker::handleJdbSettled()
for (int i = 0; i < 120 && m_jdbProcess->state() == QProcess::Running; ++i) {
m_jdbProcess->waitForReadyRead(500ms);
const QByteArray lines = m_jdbProcess->readAllRawStandardOutput();
qCDebug(androidRunWorkerLog) << "JDB output:" << lines;
const auto linesList = lines.split('\n');
for (const auto &line : linesList) {
auto msg = line.trimmed();
@@ -780,11 +782,13 @@ void AndroidRunnerWorker::handleJdbSettled()
return false;
};
const QStringList commands{"threads", "cont", "exit"};
const QStringList commands{"suspend", "resume", "cont", "exit"};
for (const QString &command : commands) {
if (waitForCommand())
if (waitForCommand()) {
qCDebug(androidRunWorkerLog) << "JDB input:" << command;
m_jdbProcess->write(QString("%1\n").arg(command));
}
}
if (!m_jdbProcess->waitForFinished(s_jdbTimeout)) {