From 669a77bac497aae5ef44d282ea2a8122cdbcad23 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Fri, 14 Oct 2016 14:36:08 +0200
Subject: [PATCH] QmlDesigner.PropertyEditor: Fixing font issues

fully qualify properties to avoid ambiguities

Task-number: QTCREATORBUG-16403
Change-Id: I0f0f7a7dbf28f51aa82bf3e2fd2652189c460102
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../propertyEditorQmlSources/HelperWidgets/FontComboBox.qml   | 4 ++--
 .../propertyEditorQmlSources/HelperWidgets/FontSection.qml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml
index dafd287dd85..ffc774d7cd0 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml
@@ -40,7 +40,7 @@ Controls.ComboBox {
     model: ["Arial", "Times New Roman", "Courier", "Verdana", "Tahoma"]
 
     onModelChanged: {
-        editText = backendValue.valueToString
+        editText = comboBox.backendValue.valueToString
     }
 
     style: CustomComboBoxStyle {
@@ -50,7 +50,7 @@ Controls.ComboBox {
     ColorLogic {
         id: colorLogic
         backendValue: comboBox.backendValue
-        property string textValue: backendValue.value
+        property string textValue: comboBox.backendValue.valueToString
         onTextValueChanged: {
             comboBox.editText = textValue
         }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml
index 5b718338379..f823a58ba8e 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml
@@ -60,7 +60,7 @@ Section {
             text: qsTr("Font")
         }
         FontComboBox {
-            backendValue: fontFamily
+            backendValue: fontSection.fontFamily
             Layout.fillWidth: true
         }