From 913d034e52bc11213212b30caf7a97871ffe46fe Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 31 Aug 2021 22:22:33 +0200 Subject: [PATCH] QmlDesigner: Never instantiate controls from component This will break the file selectors for styles. Change-Id: Ie539f768eb277fb4dc0df3eceb736ff9e4353837 Reviewed-by: Thomas Hartmann --- .../qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp index 51e4ef2ff5f..be4c3ea626c 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp @@ -221,6 +221,9 @@ QString static getErrorString(QQmlEngine *engine, const QString &componentPath) bool isInPathList(const QStringList &pathList, const QString &componentPath) { + if (componentPath.indexOf("qml/QtQuick/Controls") > 0) + return true; + return std::any_of(pathList.begin(), pathList.end(), [&](auto &&path) { return componentPath.startsWith(path); });