aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androidrunnerworker.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-12-16 16:19:44 +0100
committerEike Ziller <eike.ziller@qt.io>2019-12-16 16:19:44 +0100
commit267946d100190d2e76dc444463e690257860cbb7 (patch)
tree80b1a0260a8f8f7745e9bf27a3b3e267c454660d /src/plugins/android/androidrunnerworker.cpp
parent3dfa18818240006d1458f8f9104b4b8c336a60e0 (diff)
parent0d005b7057bad62797ac9f5a9afe81db683a42b0 (diff)
Merge remote-tracking branch 'origin/4.11'
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/boot2qt/qdbrunconfiguration.cpp src/plugins/boot2qt/qdbrunconfiguration.h src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp src/plugins/qnx/qnxrunconfiguration.cpp src/plugins/remotelinux/remotelinuxrunconfiguration.h Change-Id: I17c8e1bf300bb75d7317ccf7749dd3cc07709c21
Diffstat (limited to 'src/plugins/android/androidrunnerworker.cpp')
-rw-r--r--src/plugins/android/androidrunnerworker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index c2464ee218..6223d87792 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -596,7 +596,7 @@ void AndroidRunnerWorker::handleJdbWaiting()
QStringList jdbArgs("-connect");
jdbArgs << QString("com.sun.jdi.SocketAttach:hostname=localhost,port=%1")
.arg(m_localJdbServerPort.toString());
- qCDebug(androidRunWorkerLog) << "Starting JDB:" << jdbPath << jdbArgs.join(' ');
+ qCDebug(androidRunWorkerLog) << "Starting JDB:" << CommandLine(jdbPath, jdbArgs).toUserOutput();
std::unique_ptr<QProcess, Deleter> jdbProcess(new QProcess, &deleter);
jdbProcess->setProcessChannelMode(QProcess::MergedChannels);
jdbProcess->start(jdbPath.toString(), jdbArgs);