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

Qbs: Fix executable path in equivalent command line

Browse Source 
Use QbsSettings to get qbs executable file path.

Change-Id: Ie8e9dc85712a2a51ee14b5715cf5529ecd3b44c0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Raphaël Cotty
2020-12-03 20:59:34 +01:00
parent 7622cc4c09
commit 8f8fa81c30
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
View File

@@ -272,11 +272,7 @@ QString QbsBuildConfiguration::configurationName() const
QString QbsBuildConfiguration::equivalentCommandLine(const QbsBuildStepData &stepData) const
{
CommandLine commandLine;
const QString qbsInstallDir = QString::fromLocal8Bit(qgetenv("QBS_INSTALL_DIR"));
const QString qbsFilePath = HostOsInfo::withExecutableSuffix(!qbsInstallDir.isEmpty()
? qbsInstallDir + QLatin1String("/bin/qbs")
: QCoreApplication::applicationDirPath() + QLatin1String("/qbs"));
commandLine.addArg(QDir::toNativeSeparators(qbsFilePath));
commandLine.addArg(QDir::toNativeSeparators(QbsSettings::qbsExecutableFilePath().toString()));
commandLine.addArg(stepData.command);
const QString buildDir = buildDirectory().toUserOutput();
commandLine.addArgs({"-d", buildDir});