diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-14 12:26:52 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-16 13:12:45 +0000 |
| commit | e073d23ea1e7589942e4c2a902deef1fb32c1916 (patch) | |
| tree | 1237f65d495ebfb42a79cf9ac5f7b920e43abc67 /src | |
| parent | 032dd4a340e9285e231f08d883e8d78cd1f6e0d0 (diff) | |
Generic/Base make step: Use path chooser for make command
Change-Id: Ib926305104379ae5af6e1a859e5e482711cb39e3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/projectexplorer/makestep.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/makestep.ui | 14 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp index 7c7b645714..1a54b8117a 100644 --- a/src/plugins/projectexplorer/makestep.cpp +++ b/src/plugins/projectexplorer/makestep.cpp @@ -176,14 +176,17 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep) : 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()); updateMakeOverrideLabel(); updateDetails(); connect(m_ui->targetsList, &QListWidget::itemChanged, this, &MakeStepConfigWidget::itemChanged); - connect(m_ui->makeLineEdit, &QLineEdit::textEdited, + connect(m_ui->makeLineEdit, &Utils::PathChooser::rawPathChanged, this, &MakeStepConfigWidget::makeLineEditTextEdited); connect(m_ui->makeArgumentsLineEdit, &QLineEdit::textEdited, this, &MakeStepConfigWidget::makeArgumentsLineEditTextEdited); @@ -266,7 +269,7 @@ void MakeStepConfigWidget::itemChanged(QListWidgetItem *item) void MakeStepConfigWidget::makeLineEditTextEdited() { - m_makeStep->setMakeCommand(m_ui->makeLineEdit->text()); + m_makeStep->setMakeCommand(m_ui->makeLineEdit->rawPath()); updateDetails(); } diff --git a/src/plugins/projectexplorer/makestep.ui b/src/plugins/projectexplorer/makestep.ui index 1f91e0b5ee..73350447d0 100644 --- a/src/plugins/projectexplorer/makestep.ui +++ b/src/plugins/projectexplorer/makestep.ui @@ -37,7 +37,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="QLineEdit" name="makeLineEdit"/> + <widget class="Utils::PathChooser" name="makeLineEdit" native="true"/> </item> <item row="1" column="0"> <widget class="QLabel" name="makeArgumentsLabel"> @@ -67,6 +67,18 @@ </item> </layout> </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/> <connections/> </ui> |