diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-10-05 15:37:36 +0200 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-10-05 13:49:24 +0000 |
commit | 469e7a7edf45b82c2a5c44f7f316aabfa041c8c9 (patch) | |
tree | 5a0dc921a9bec02d01fcd1f07b1522193bb311e3 /share | |
parent | aeb30c0840928df1ec7117302b28bd7861a79478 (diff) |
QmlDesigner.qml2puppet: Fix build with Qt6
Change-Id: Ib9580fa1b6c1699e830898234b286f3ee999d477
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'share')
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp index b1494e5b3b..d5701d7fc9 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp @@ -230,13 +230,21 @@ void emitComponentComplete(QObject *item) QQmlData *data = QQmlData::get(item); if (data && data->context) { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QQmlComponentAttached *componentAttached = data->context->componentAttached; +#else + QQmlComponentAttached *componentAttached = data->context->componentAttacheds(); +#endif while (componentAttached) { if (componentAttached->parent()) if (componentAttached->parent() == item) emit componentAttached->completed(); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) componentAttached = componentAttached->next; +#else + componentAttached = componentAttached->next(); +#endif } } } |