diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-03 01:00:30 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-03 06:11:21 +0000 |
| commit | 97aa001da97ee8531b3de4bd97496478b2f3f2e9 (patch) | |
| tree | 62ff6e849ea545769c8e5f245eaa34531760a1a2 /tools | |
| parent | 71d4a62661f771f1ac900fab02840f7863a0deed (diff) | |
| parent | 6dffa5400fd056e3862a2f8905362679c1bb6be7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Icd05d016de5b4cf9af5234cb47b5c3fd0f6a053e
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index f3b931fbbf..0a66aa419b 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -479,8 +479,12 @@ public: } } - for (const QMetaObject *meta : qAsConst(objectsToMerge)) + for (const QMetaObject *meta : qAsConst(objectsToMerge)) { + for (int index = meta->enumeratorOffset(); index < meta->enumeratorCount(); ++index) + dump(meta->enumerator(index)); + writeMetaContent(meta, &knownAttributes); + } qml->writeEndObject(); } |