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

QbsPM: Support variables in build configuration properties

Browse Source 
Change-Id: Id438c33d14e0e7b27ea81fa39395c2d68d8a7736
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Orgad Shaneh
2016-09-20 17:11:03 +03:00
committed by Orgad Shaneh
parent 01e2226a70
commit baf74ae070
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -34,11 +34,13 @@
#include "ui_qbsbuildstepconfigwidget.h" #include "ui_qbsbuildstepconfigwidget.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/variablechooser.h>
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/kit.h> #include <projectexplorer/kit.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qtsupport/qtversionmanager.h> #include <qtsupport/qtversionmanager.h>
#include <utils/macroexpander.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <utils/utilsicons.h> #include <utils/utilsicons.h>
@@ -473,6 +475,8 @@ QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) :
m_ui = new Ui::QbsBuildStepConfigWidget; m_ui = new Ui::QbsBuildStepConfigWidget;
m_ui->setupUi(this); m_ui->setupUi(this);
auto chooser = new Core::VariableChooser(this);
chooser->addSupportedWidget(m_ui->propertyEdit);
m_ui->propertyEdit->setValidationFunction([this](Utils::FancyLineEdit *edit, m_ui->propertyEdit->setValidationFunction([this](Utils::FancyLineEdit *edit,
QString *errorMessage) { QString *errorMessage) {
return validateProperties(edit, errorMessage); return validateProperties(edit, errorMessage);
@@ -692,7 +696,9 @@ bool QbsBuildStepConfigWidget::validateProperties(Utils::FancyLineEdit *edit, QS
} }
QList<QPair<QString, QString> > properties; QList<QPair<QString, QString> > properties;
foreach (const QString &arg, argList) { Utils::MacroExpander *expander = Utils::globalMacroExpander();
foreach (const QString &rawArg, argList) {
const QString arg = expander->expand(rawArg);
int pos = arg.indexOf(QLatin1Char(':')); int pos = arg.indexOf(QLatin1Char(':'));
QString key; QString key;
QString value; QString value;