diff options
author | hjk <[email protected]> | 2021-04-29 17:44:59 +0200 |
---|---|---|
committer | hjk <[email protected]> | 2021-05-03 10:49:01 +0000 |
commit | c75c6f342e0feea31db636d37c594a3c886ecaa5 (patch) | |
tree | 6c860c5f4098f093d911e6b7dd66990c25f0e04f /src/plugins/debugger/debuggersourcepathmappingwidget.cpp | |
parent | 03b2920d31fbbaf81fdf8248b39a881ca1868e89 (diff) |
Debugger: Make findQtInstallPath remote-aware
Change-Id: I3df662a182c079725e616776befead30265f22b3
Reviewed-by: David Schulz <[email protected]>
Diffstat (limited to 'src/plugins/debugger/debuggersourcepathmappingwidget.cpp')
-rw-r--r-- | src/plugins/debugger/debuggersourcepathmappingwidget.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp index 2dc1ea932b1..92858969ec3 100644 --- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp +++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp @@ -34,7 +34,6 @@ #include <utils/layoutbuilder.h> #include <utils/pathchooser.h> #include <utils/qtcassert.h> -#include <utils/synchronousprocess.h> #include <utils/variablechooser.h> #include <QFileDialog> @@ -444,11 +443,9 @@ static QString findQtInstallPath(const FilePath &qmakePath) { if (qmakePath.isEmpty()) return QString(); - QProcess proc; - QStringList args; - args.append("-query"); - args.append("QT_INSTALL_HEADERS"); - proc.start(qmakePath.toString(), args); + QtcProcess proc; + proc.setCommand({qmakePath, {"-query", "QT_INSTALL_HEADERS"}}); + proc.start(); if (!proc.waitForStarted()) { qWarning("%s: Cannot start '%s': %s", Q_FUNC_INFO, qPrintable(qmakePath.toString()), qPrintable(proc.errorString())); @@ -456,7 +453,7 @@ static QString findQtInstallPath(const FilePath &qmakePath) } proc.closeWriteChannel(); if (!proc.waitForFinished()) { - SynchronousProcess::stopProcess(proc); + proc.stopProcess(); qWarning("%s: Timeout running '%s'.", Q_FUNC_INFO, qPrintable(qmakePath.toString())); return QString(); } |