From cb079c5319b92419a6031759689b1a5c29aea5f5 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 24 Jun 2014 16:12:00 +0200 Subject: [PATCH] Qbs: Use BuildConfig data in Qbs install step ... 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 --- src/plugins/qbsprojectmanager/qbsinstallstep.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp index 6fa1ec0258c..e5ce4156813 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp @@ -308,9 +308,7 @@ void QbsInstallStepConfigWidget::updateState() m_ui->keepGoingCheckBox->setChecked(m_step->keepGoing()); } - const qbs::ProjectData data = static_cast(m_step->project())->qbsProjectData(); - if (data.isValid()) - m_ui->installRootChooser->setBaseDirectory(data.buildDirectory()); + m_ui->installRootChooser->setBaseFileName(m_step->target()->activeBuildConfiguration()->buildDirectory()); QString command = QLatin1String("qbs install "); command += QString::fromLatin1("--settings-dir ")