From 2de2a4808ac3bfc17c6f51d03050afd7909ba120 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Tue, 21 Jun 2022 00:21:50 +0200
Subject: [PATCH] QmlDesigner: Fix FontComboBox drag'n'drop

* Fix URL schema to also work under macOS
* Avoid setting font name and further processing if error during font
  loading occurred

Change-Id: I9d07a3daad8f7c8c464422b0cf3f94d61e4b231d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../imports/HelperWidgets/FontComboBox.qml                | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontComboBox.qml
index 8c05fa2f878..2f087c3b299 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontComboBox.qml
@@ -65,9 +65,11 @@ StudioControls.ComboBox {
 
         onDropped: function(drop) {
             drop.accepted = root.hasActiveHoverDrag
-            var fontLoader = root.createFontLoader("file:///" + dropArea.assetPath)
-            root.backendValue.value = fontLoader.name
-            root.currentIndex = root.find(root.backendValue.value)
+            var fontLoader = root.createFontLoader("file:" + dropArea.assetPath)
+            if (fontLoader.status === FontLoader.Ready) {
+                root.backendValue.value = fontLoader.name
+                root.currentIndex = root.find(root.backendValue.value)
+            }
             root.hasActiveHoverDrag = false
             root.backendValue.commitDrop(dropArea.assetPath)
         }