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

Qbs: Use BuildConfig data in Qbs install step

Browse Source 
... in favor of qbs::ProductData which is harder to get anyway.

Not worth the trouble just to register the default value.

Change-Id: If597de246028a7eb0859a19b543e9ffe12b31db5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2014-06-24 16:12:00 +02:00
parent c3f8346b9b
commit cb079c5319
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qbsprojectmanager/qbsinstallstep.cpp
View File

@@ -308,9 +308,7 @@ void QbsInstallStepConfigWidget::updateState()
m_ui->keepGoingCheckBox->setChecked(m_step->keepGoing()); m_ui->keepGoingCheckBox->setChecked(m_step->keepGoing());
} }
const qbs::ProjectData data = static_cast<QbsProject *>(m_step->project())->qbsProjectData(); m_ui->installRootChooser->setBaseFileName(m_step->target()->activeBuildConfiguration()->buildDirectory());
if (data.isValid())
m_ui->installRootChooser->setBaseDirectory(data.buildDirectory());
QString command = QLatin1String("qbs install "); QString command = QLatin1String("qbs install ");
command += QString::fromLatin1("--settings-dir ") command += QString::fromLatin1("--settings-dir ")