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

ProjectExplorer: Restrict uses of history completer key

Browse Source 
... to cases where one was actually defined.

Change-Id: I3b23734f3e563389ef74e8089ce98300adc466bc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2018-10-22 12:22:01 +02:00
parent b4849f20e3
commit fb9865444d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/projectconfigurationaspects.cpp
View File

@@ -217,6 +217,7 @@ void BaseStringAspect::addToConfigurationLayout(QFormLayout *layout)
case PathChooserDisplay: case PathChooserDisplay:
d->m_pathChooserDisplay = new PathChooser(parent); d->m_pathChooserDisplay = new PathChooser(parent);
d->m_pathChooserDisplay->setExpectedKind(d->m_expectedKind); d->m_pathChooserDisplay->setExpectedKind(d->m_expectedKind);
if (!d->m_historyCompleterKey.isEmpty())
d->m_pathChooserDisplay->setHistoryCompleter(d->m_historyCompleterKey); d->m_pathChooserDisplay->setHistoryCompleter(d->m_historyCompleterKey);
d->m_pathChooserDisplay->setEnvironment(d->m_environment); d->m_pathChooserDisplay->setEnvironment(d->m_environment);
connect(d->m_pathChooserDisplay, &PathChooser::pathChanged, connect(d->m_pathChooserDisplay, &PathChooser::pathChanged,
@@ -226,6 +227,7 @@ void BaseStringAspect::addToConfigurationLayout(QFormLayout *layout)
case LineEditDisplay: case LineEditDisplay:
d->m_lineEditDisplay = new FancyLineEdit(parent); d->m_lineEditDisplay = new FancyLineEdit(parent);
d->m_lineEditDisplay->setPlaceholderText(d->m_placeHolderText); d->m_lineEditDisplay->setPlaceholderText(d->m_placeHolderText);
if (!d->m_historyCompleterKey.isEmpty())
d->m_lineEditDisplay->setHistoryCompleter(d->m_historyCompleterKey); d->m_lineEditDisplay->setHistoryCompleter(d->m_historyCompleterKey);
connect(d->m_lineEditDisplay, &FancyLineEdit::textEdited, connect(d->m_lineEditDisplay, &FancyLineEdit::textEdited,
this, &BaseStringAspect::setValue); this, &BaseStringAspect::setValue);