From b8e195d22be3c7d5f97c60f7adab39683846672a Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 23 Dec 2022 15:02:47 +0100 Subject: [PATCH] qmlpuppet: Fix build with Qt 5 The API uses QVector, which is a QList in Qt 6, which is why assigning a QVector to a QList works "fine" there. But with Qt 5 we must use the correct type. Also assign to a const variable. Otherwise this actually forces a detach. Amends 9321c6ad24042a256ac44d28e5263e45f0fb4a16 Change-Id: Ied562b96d647435ae48395ae08cc12a5670ac607 Reviewed-by: Reviewed-by: Qt CI Bot Reviewed-by: Artem Sokolovskii Reviewed-by: Eike Ziller --- .../qml2puppet/instances/qt5informationnodeinstanceserver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp index a84409b3331..2de53a8b5bf 100644 --- a/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp +++ b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp @@ -2123,7 +2123,7 @@ void Qt5InformationNodeInstanceServer::completeComponent(const CompleteComponent Qt5NodeInstanceServer::completeComponent(command); QList instanceList; - QList instances = command.instances(); + const QVector instances = command.instances(); for (qint32 instanceId : instances) { if (hasInstanceForId(instanceId)) { ServerNodeInstance instance = instanceForId(instanceId);