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

Use QtcProcess in QbsProfileManager

Browse Source 
Change-Id: I75802dae680b1ef36662ebe6281076919430cebc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2021-11-03 15:48:22 +01:00
parent c8a25e0e57
commit 595cfdb3ac
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qbsprojectmanager/qbsprofilemanager.cpp
View File

@@ -40,10 +40,10 @@
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <QCryptographicHash>
#include <QJSEngine>
#include <QProcess>
#include <QRegularExpression>
#include <QVariantMap>
@@ -218,7 +218,7 @@ QString QbsProfileManager::profileNameForKit(const ProjectExplorer::Kit *kit)
QString QbsProfileManager::runQbsConfig(QbsConfigOp op, const QString &key, const QVariant &value)
{
QProcess qbsConfig;
Utils::QtcProcess qbsConfig;
QStringList args("config");
if (QbsSettings::useCreatorSettingsDirForQbs())
args << "--settings-dir" << QbsSettings::qbsSettingsBaseDir();
@@ -245,7 +245,8 @@ QString QbsProfileManager::runQbsConfig(QbsConfigOp op, const QString &key, cons
const Utils::FilePath qbsExe = QbsSettings::qbsExecutableFilePath();
if (qbsExe.isEmpty() || !qbsExe.exists())
return {};
qbsConfig.start(qbsExe.toString(), args);
qbsConfig.setCommand({qbsExe, args});
qbsConfig.start();
if (!qbsConfig.waitForStarted(3000) || !qbsConfig.waitForFinished(5000)) {
Core::MessageManager::writeFlashing(
tr("Failed to run qbs config: %1").arg(qbsConfig.errorString()));