From 10f2fb7be239c1843beca7c30fea62823413a06d Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 18 Mar 2022 12:16:14 +0200 Subject: [PATCH] QmlDesigner: Don't scan for fonts if resource path is not valid For some reason captureiconmode puppet is launched at QDS shutdown, with empty resource path. This caused the entire drive to be searched for fonts to register, making the puppet linger for up to a minute after the shutdown. Fixes: QDS-6482 Change-Id: I0f1fa4b6f5646c76d93f5820dae029033e1543a3 Reviewed-by: Mahmoud Badri Reviewed-by: Reviewed-by: Thomas Hartmann --- .../qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp index d496aff3889..a6e7e259e28 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp @@ -1576,6 +1576,9 @@ void NodeInstanceServer::setupState(qint32 stateInstanceId) void NodeInstanceServer::registerFonts(const QUrl &resourceUrl) const { + if (!resourceUrl.isValid()) + return; + // Autoregister all fonts found inside the project QDirIterator it {QFileInfo(resourceUrl.toLocalFile()).absoluteFilePath(), {"*.ttf", "*.otf"}, QDir::Files, QDirIterator::Subdirectories};