diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2022-03-18 12:16:14 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2022-03-18 11:27:35 +0000 |
| commit | 10f2fb7be239c1843beca7c30fea62823413a06d (patch) | |
| tree | 2303d9238de4a50d0c8971c7cd4ea77ab05121ce /share | |
| parent | 1651efaee7b64da122d68e7c68cf86f3d50f7507 (diff) | |
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 <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp index d496aff388..a6e7e259e2 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}; |