diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-12-16 10:07:06 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-16 10:13:27 +0100 |
| commit | a6d3c194fb0ea676d85dddf1fd005f169391666f (patch) | |
| tree | e2c912f6f931b30d4fffbe524780dbcdfd5760b8 | |
| parent | a4af25654436b22e6d393a47f421eec990f57bed (diff) | |
qscxmlc: Avoid QHash::unite()
As we don't have QHash::insert(QHash), yet, we have to iterate for now.
Task-number: QTBUG-80813
Change-Id: I2288a9d35362556a7cc869cfa7b0d51fb88a2c4e
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | tools/qscxmlc/generator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qscxmlc/generator.cpp b/tools/qscxmlc/generator.cpp index 6febf09..26f9f88 100644 --- a/tools/qscxmlc/generator.cpp +++ b/tools/qscxmlc/generator.cpp @@ -442,7 +442,8 @@ void Generator::generateCode() // QList<QByteArray> extraList; QHash<QByteArray, QByteArray> knownExtraMetaObject = knownGadgets; - knownExtraMetaObject.unite(knownQObjectClasses); + for (auto it = knownQObjectClasses.begin(), end = knownQObjectClasses.end(); it != end; ++it) + knownExtraMetaObject.insert(it.key(), it.value()); for (int i = 0; i < cdef->propertyList.count(); ++i) { const PropertyDef &p = cdef->propertyList.at(i); |