feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner.PropertyEditor: Fixing font issues

Browse Source 
fully qualify properties to avoid ambiguities

Task-number: QTCREATORBUG-16403
Change-Id: I0f0f7a7dbf28f51aa82bf3e2fd2652189c460102
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2016-10-14 14:36:08 +02:00
committed by Tim Jenssen
parent 8af2c18341
commit 669a77bac4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml
View File

@@ -40,7 +40,7 @@ Controls.ComboBox {
model: ["Arial", "Times New Roman", "Courier", "Verdana", "Tahoma"] model: ["Arial", "Times New Roman", "Courier", "Verdana", "Tahoma"]
onModelChanged: { onModelChanged: {
editText = backendValue.valueToString editText = comboBox.backendValue.valueToString
} }
style: CustomComboBoxStyle { style: CustomComboBoxStyle {
@@ -50,7 +50,7 @@ Controls.ComboBox {
ColorLogic { ColorLogic {
id: colorLogic id: colorLogic
backendValue: comboBox.backendValue backendValue: comboBox.backendValue
property string textValue: backendValue.value property string textValue: comboBox.backendValue.valueToString
onTextValueChanged: { onTextValueChanged: {
comboBox.editText = textValue comboBox.editText = textValue
} }

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml
View File

@@ -60,7 +60,7 @@ Section {
text: qsTr("Font") text: qsTr("Font")
} }
FontComboBox { FontComboBox {
backendValue: fontFamily backendValue: fontSection.fontFamily
Layout.fillWidth: true Layout.fillWidth: true
} }