From 02226300120a2c3c3795159736ed0b84d46fbb44 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Mon, 6 Apr 2020 15:50:54 +0200
Subject: [PATCH] QmlDesigner: Add fontStyle support

Task-number: QDS-1884
Change-Id: Ifb3ec8cf92668adb2e4e5f01e0e0b2403eb4cbac
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../imports/HelperWidgets/FontSection.qml     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml
index a97923a032c..4ef079af4c7 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml
@@ -68,9 +68,12 @@ Section {
             text: qsTr("Font")
         }
         FontComboBox {
+            id: fontComboBox
             backendValue: fontSection.fontFamily
             Layout.fillWidth: true
             width: 160
+            property string familyName: backendValue.value
+            onFamilyNameChanged: print(styleNamesForFamily(familyName))
         }
 
         Label {
@@ -151,6 +154,7 @@ Section {
             italic: fontSection.italicStyle
             underline: fontSection.underlineStyle
             strikeout: fontSection.strikeoutStyle
+            enabled: !styleComboBox.styleSet
         }
 
         Label {
@@ -175,6 +179,21 @@ Section {
             backendValue: getBackendValue("weight")
             model:  ["Normal", "Light", "ExtraLight", "Thin", "Medium", "DemiBold", "Bold", "ExtraBold", "Black"]
             scope: "Font"
+            enabled: !styleComboBox.styleSet
+        }
+
+        Label {
+            text: qsTr("Style name")
+            toolTip: qsTr("Sets the font's style.")
+        }
+
+        ComboBox {
+            id: styleComboBox
+            property bool styleSet: backendValue.isInModel
+            Layout.fillWidth: true
+            backendValue: getBackendValue("styleName")
+            model: styleNamesForFamily(fontComboBox.familyName)
+            useString: true
         }
 
         Label {