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

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

@@ -313,11 +313,8 @@ QVariant MacroExpander::expandVariant(const QVariant &v) const
} else if (type == QMetaType::QVariantMap) {
const auto map = v.toMap();
QVariantMap result;
QMapIterator<QString, QVariant> it(map);
while (it.hasNext()) {
it.next();
for (auto it = map.cbegin(), end = map.cend(); it != end; ++it)
result.insert(it.key(), expandVariant(it.value()));
}
return result;
}
return v;