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

Debugger: Make findQtInstallPath remote-aware

Browse Source 
Change-Id: I3df662a182c079725e616776befead30265f22b3
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-04-29 17:44:59 +02:00
parent 03b2920d31
commit c75c6f342e
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/debugger/debuggersourcepathmappingwidget.cpp
View File

@@ -34,7 +34,6 @@
#include <utils/layoutbuilder.h> #include <utils/layoutbuilder.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/synchronousprocess.h>
#include <utils/variablechooser.h> #include <utils/variablechooser.h>
#include <QFileDialog> #include <QFileDialog>
@@ -444,11 +443,9 @@ static QString findQtInstallPath(const FilePath &qmakePath)
{ {
if (qmakePath.isEmpty()) if (qmakePath.isEmpty())
return QString(); return QString();
QProcess proc; QtcProcess proc;
QStringList args; proc.setCommand({qmakePath, {"-query", "QT_INSTALL_HEADERS"}});
args.append("-query"); proc.start();
args.append("QT_INSTALL_HEADERS");
proc.start(qmakePath.toString(), args);
if (!proc.waitForStarted()) { if (!proc.waitForStarted()) {
qWarning("%s: Cannot start '%s': %s", Q_FUNC_INFO, qPrintable(qmakePath.toString()), qWarning("%s: Cannot start '%s': %s", Q_FUNC_INFO, qPrintable(qmakePath.toString()),
qPrintable(proc.errorString())); qPrintable(proc.errorString()));
@@ -456,7 +453,7 @@ static QString findQtInstallPath(const FilePath &qmakePath)
} }
proc.closeWriteChannel(); proc.closeWriteChannel();
if (!proc.waitForFinished()) { if (!proc.waitForFinished()) {
SynchronousProcess::stopProcess(proc); proc.stopProcess();
qWarning("%s: Timeout running '%s'.", Q_FUNC_INFO, qPrintable(qmakePath.toString())); qWarning("%s: Timeout running '%s'.", Q_FUNC_INFO, qPrintable(qmakePath.toString()));
return QString(); return QString();
} }