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

Generic/Base make step: Use path chooser for make command

Browse Source 
Change-Id: Ib926305104379ae5af6e1a859e5e482711cb39e3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Eike Ziller
2018-05-14 12:26:52 +02:00
parent 032dd4a340
commit e073d23ea1
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/makestep.cpp
View File

@@ -176,14 +176,17 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep) :
item->setCheckState(m_makeStep->buildsTarget(item->text()) ? Qt::Checked : Qt::Unchecked); item->setCheckState(m_makeStep->buildsTarget(item->text()) ? Qt::Checked : Qt::Unchecked);
} }
m_ui->makeLineEdit->setText(m_makeStep->makeCommand()); m_ui->makeLineEdit->setExpectedKind(Utils::PathChooser::ExistingCommand);
m_ui->makeLineEdit->setBaseDirectory(Utils::PathChooser::homePath());
m_ui->makeLineEdit->setHistoryCompleter("PE.MakeCommand.History");
m_ui->makeLineEdit->setPath(m_makeStep->makeCommand());
m_ui->makeArgumentsLineEdit->setText(m_makeStep->userArguments()); m_ui->makeArgumentsLineEdit->setText(m_makeStep->userArguments());
updateMakeOverrideLabel(); updateMakeOverrideLabel();
updateDetails(); updateDetails();
connect(m_ui->targetsList, &QListWidget::itemChanged, connect(m_ui->targetsList, &QListWidget::itemChanged,
this, &MakeStepConfigWidget::itemChanged); this, &MakeStepConfigWidget::itemChanged);
connect(m_ui->makeLineEdit, &QLineEdit::textEdited, connect(m_ui->makeLineEdit, &Utils::PathChooser::rawPathChanged,
this, &MakeStepConfigWidget::makeLineEditTextEdited); this, &MakeStepConfigWidget::makeLineEditTextEdited);
connect(m_ui->makeArgumentsLineEdit, &QLineEdit::textEdited, connect(m_ui->makeArgumentsLineEdit, &QLineEdit::textEdited,
this, &MakeStepConfigWidget::makeArgumentsLineEditTextEdited); this, &MakeStepConfigWidget::makeArgumentsLineEditTextEdited);
@@ -266,7 +269,7 @@ void MakeStepConfigWidget::itemChanged(QListWidgetItem *item)
void MakeStepConfigWidget::makeLineEditTextEdited() void MakeStepConfigWidget::makeLineEditTextEdited()
{ {
m_makeStep->setMakeCommand(m_ui->makeLineEdit->text()); m_makeStep->setMakeCommand(m_ui->makeLineEdit->rawPath());
updateDetails(); updateDetails();
} }

14
src/plugins/projectexplorer/makestep.ui
View File

@@ -37,7 +37,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="makeLineEdit"/> <widget class="Utils::PathChooser" name="makeLineEdit" native="true"/>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="makeArgumentsLabel"> <widget class="QLabel" name="makeArgumentsLabel">
@@ -67,6 +67,18 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>Utils::PathChooser</class>
<extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header>
<container>1</container>
<slots>
<signal>editingFinished()</signal>
<signal>browsingFinished()</signal>
</slots>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>