diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2014-03-03 17:32:40 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-03-03 17:40:22 +0100 |
| commit | 4c4bb918867dd49603aa54efbfc824d2dbda1d1d (patch) | |
| tree | 43995ca091f9a5c3ec21bdb7ddd25a2e7983c7f4 | |
| parent | 158fa9c487da375dece883d9f499d7f22b060fa7 (diff) | |
| download | qt-creator-4c4bb918867dd49603aa54efbfc824d2dbda1d1d.tar.gz | |
Qbs: Give path to settings in Qbs build and install steps
Give the settingspath where the Qt Creator profiles are stored
in the Qbs build- and install steps.
Change-Id: I048525083fc39ca824d866e885d44325306e1030
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsinstallstep.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 4ac5f4721e..9846a4e056 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -36,6 +36,7 @@ #include "ui_qbsbuildstepconfigwidget.h" +#include <coreplugin/icore.h> #include <projectexplorer/buildsteplist.h> #include <projectexplorer/kit.h> #include <projectexplorer/projectexplorerconstants.h> @@ -431,6 +432,8 @@ void QbsBuildStepConfigWidget::updateState() m_ui->buildVariantComboBox->setCurrentIndex(idx); QString command = QLatin1String("qbs build "); + command += QString::fromLatin1("--settings-dir ") + + QDir::toNativeSeparators(Core::ICore::userResourcePath()) + QLatin1String(" "); if (m_step->dryRun()) command += QLatin1String("--dry-run "); if (m_step->keepGoing()) diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp index 738a2a6812..6fa1ec0258 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp @@ -35,6 +35,7 @@ #include "ui_qbsinstallstepconfigwidget.h" +#include <coreplugin/icore.h> #include <projectexplorer/buildsteplist.h> #include <projectexplorer/deployconfiguration.h> #include <projectexplorer/kit.h> @@ -312,6 +313,8 @@ void QbsInstallStepConfigWidget::updateState() m_ui->installRootChooser->setBaseDirectory(data.buildDirectory()); QString command = QLatin1String("qbs install "); + command += QString::fromLatin1("--settings-dir ") + + QDir::toNativeSeparators(Core::ICore::userResourcePath()) + QLatin1String(" "); if (m_step->dryRun()) command += QLatin1String("--dry-run "); if (m_step->keepGoing()) |