From 469e7a7edf45b82c2a5c44f7f316aabfa041c8c9 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 5 Oct 2020 15:37:36 +0200 Subject: QmlDesigner.qml2puppet: Fix build with Qt6 Change-Id: Ib9580fa1b6c1699e830898234b286f3ee999d477 Reviewed-by: Miikka Heikkinen --- .../qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'share') 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 } } } -- cgit v1.2.3