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

Compile fix with recent Qt dev

Browse Source 
The reasoning in 1b4766e26c did not take into account that the scope
of QT_NO_JAVA_STYLE_ITERATORS may change over time, as done with
f70905448f6 in Qt base.

Change-Id: Ib1966ff26c4d36d5f62e149d6b45baa4aecf825d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-07-24 13:43:54 +02:00
parent 02e224fcfa
commit e3b1106afa
70 changed files with 238 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/macros/macrooptionswidget.cpp
View File

@@ -88,10 +88,7 @@ void MacroOptionsWidget::createTable()
{
QDir dir(MacroManager::macrosDirectory());
const Core::Id base = Core::Id(Constants::PREFIX_MACRO);
QMapIterator<QString, Macro *> it(MacroManager::macros());
while (it.hasNext()) {
it.next();
Macro *macro = it.value();
for (Macro *macro : MacroManager::macros()) {
QFileInfo fileInfo(macro->fileName());
if (fileInfo.absoluteDir() == dir.absolutePath()) {
auto macroItem = new QTreeWidgetItem(m_ui->treeWidget);
@@ -140,11 +137,8 @@ void MacroOptionsWidget::apply()
}
// Change macro
QMapIterator<QString, QString> it(m_macroToChange);
while (it.hasNext()) {
it.next();
for (auto it = m_macroToChange.cbegin(), end = m_macroToChange.cend(); it != end; ++it)
MacroManager::instance()->changeMacro(it.key(), it.value());
}
// Reinitialize the page
initialize();