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

MacroExpander: Delay variable chooser population

Browse Source 
Change-Id: I4bf81bcf8bb4f14bf6c31f613d79e79380b666e0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-11-27 17:45:49 +01:00
parent 5c6f982636
commit 99e2c9dbd4
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/macroexpander.cpp
View File

@@ -411,15 +411,9 @@ QString MacroExpander::variableDescription(const QByteArray &variable) const
return d->m_descriptions.value(variable);
}
MacroExpanders MacroExpander::subExpanders() const
MacroExpanderProviders MacroExpander::subProviders() const
{
MacroExpanders expanders;
foreach (const MacroExpanderProvider &provider, d->m_subProviders)
if (provider)
if (MacroExpander *expander = provider())
expanders.append(expander);
return expanders;
return d->m_subProviders;
}
QString MacroExpander::displayName() const