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

QbsProjectManager: Call qbs-config directly

Browse Source 
It's slightly faster than going through the qbs executable first.

Fixes: QTCREATORBUG-27102
Change-Id: I13297e700fed43b20e1d1185dbdfc16152584d56
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Kandeler
2022-02-24 11:51:58 +01:00
parent ace0a0d9d1
commit 1a99f41fe8
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,8 +218,7 @@ QString QbsProfileManager::profileNameForKit(const ProjectExplorer::Kit *kit)
QString QbsProfileManager::runQbsConfig(QbsConfigOp op, const QString &key, const QVariant &value) QString QbsProfileManager::runQbsConfig(QbsConfigOp op, const QString &key, const QVariant &value)
{ {
Utils::QtcProcess qbsConfig; QStringList args;
QStringList args("config");
if (QbsSettings::useCreatorSettingsDirForQbs()) if (QbsSettings::useCreatorSettingsDirForQbs())
args << "--settings-dir" << QbsSettings::qbsSettingsBaseDir(); args << "--settings-dir" << QbsSettings::qbsSettingsBaseDir();
switch (op) { switch (op) {
@@ -242,10 +241,11 @@ QString QbsProfileManager::runQbsConfig(QbsConfigOp op, const QString &key, cons
break; break;
} }
} }
const Utils::FilePath qbsExe = QbsSettings::qbsExecutableFilePath(); const Utils::FilePath qbsConfigExe = QbsSettings::qbsConfigFilePath();
if (qbsExe.isEmpty() || !qbsExe.exists()) if (qbsConfigExe.isEmpty() || !qbsConfigExe.exists())
return {}; return {};
qbsConfig.setCommand({qbsExe, args}); Utils::QtcProcess qbsConfig;
qbsConfig.setCommand({qbsConfigExe, args});
qbsConfig.start(); qbsConfig.start();
if (!qbsConfig.waitForStarted(3000) || !qbsConfig.waitForFinished(5000)) { if (!qbsConfig.waitForStarted(3000) || !qbsConfig.waitForFinished(5000)) {
Core::MessageManager::writeFlashing( Core::MessageManager::writeFlashing(

12
src/plugins/qbsprojectmanager/qbssettings.cpp
View File

@@ -87,6 +87,18 @@ FilePath QbsSettings::qbsExecutableFilePath()
return candidate; return candidate;
} }
FilePath QbsSettings::qbsConfigFilePath()
{
const FilePath qbsExe = qbsExecutableFilePath();
if (!qbsExe.isExecutableFile())
return {};
const FilePath qbsConfig = qbsExe.absolutePath().pathAppended("qbs-config")
.withExecutableSuffix();
if (!qbsConfig.isExecutableFile())
return {};
return qbsConfig;
}
QString QbsSettings::defaultInstallDirTemplate() QString QbsSettings::defaultInstallDirTemplate()
{ {
return instance().m_settings.defaultInstallDirTemplate; return instance().m_settings.defaultInstallDirTemplate;

1
src/plugins/qbsprojectmanager/qbssettings.h
View File

@@ -50,6 +50,7 @@ public:
static QbsSettings &instance(); static QbsSettings &instance();
static Utils::FilePath qbsExecutableFilePath(); static Utils::FilePath qbsExecutableFilePath();
static Utils::FilePath qbsConfigFilePath();
static bool hasQbsExecutable(); static bool hasQbsExecutable();
static QString defaultInstallDirTemplate(); static QString defaultInstallDirTemplate();
static bool useCreatorSettingsDirForQbs(); static bool useCreatorSettingsDirForQbs();