From 87a7d94629a2a0aae5dcae4df7a68bed9f621977 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Tue, 17 May 2022 15:17:42 +0200
Subject: [PATCH] QmlDesigner: Disable style name ComboBox if empty

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

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CharacterSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CharacterSection.qml
index acca2a0dd19..47fc7e4f025 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CharacterSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CharacterSection.qml
@@ -143,7 +143,8 @@ Section {
         PropertyLabel {
             text: qsTr("Style name")
             tooltip: qsTr("Font's style.")
-            blockedByTemplate: !styleNameComboBox.enabled
+            enabled: styleNameComboBox.model.length
+            blockedByTemplate: !backendValue.isAvailable
         }
 
         SecondColumnLayout {
@@ -156,7 +157,7 @@ Section {
                 backendValue: getBackendValue("styleName")
                 model: styleNamesForFamily(fontComboBox.familyName)
                 valueType: ComboBox.String
-                enabled: backendValue.isAvailable
+                enabled: backendValue.isAvailable && styleNameComboBox.model.length
             }
 
             ExpandingSpacer {}