diff options
| author | David Edmundson <davidedmundson@kde.org> | 2014-01-15 19:41:35 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-16 18:06:33 +0100 |
| commit | 66e1e0fee78f2b0a4412927ad39df4be564d15d1 (patch) | |
| tree | 0d3c1b193954176de6142930e011aa49286153e9 | |
| parent | bc973dcf2163b25f2db74d974b252384bbee8d80 (diff) | |
| download | qtquickcontrols-66e1e0fee78f2b0a4412927ad39df4be564d15d1.tar.gz qtquickcontrols-66e1e0fee78f2b0a4412927ad39df4be564d15d1.tar.bz2 qtquickcontrols-66e1e0fee78f2b0a4412927ad39df4be564d15d1.zip | |
Fix typo in property in ComboBoxStyle
drowDownButtonWidth seems to be a typo in an exposed property name.
In order to keep compatibility an (undocumented) alias is added.
Change-Id: I2ab04b3518325e339c31cf6f403c488256a4aabe
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| -rw-r--r-- | src/controls/ComboBox.qml | 2 | ||||
| -rw-r--r-- | src/controls/Styles/Base/ComboBoxStyle.qml | 11 | ||||
| -rw-r--r-- | src/controls/Styles/Desktop/ComboBoxStyle.qml | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml index 74def897..fe2b9e2b 100644 --- a/src/controls/ComboBox.qml +++ b/src/controls/ComboBox.qml @@ -348,7 +348,7 @@ Control { anchors.fill: parent anchors.leftMargin: 8 - anchors.rightMargin: __style.drowDownButtonWidth + anchors.rightMargin: __style.dropDownButtonWidth verticalAlignment: Text.AlignVCenter diff --git a/src/controls/Styles/Base/ComboBoxStyle.qml b/src/controls/Styles/Base/ComboBoxStyle.qml index 2b4b237d..ee72a1f1 100644 --- a/src/controls/Styles/Base/ComboBoxStyle.qml +++ b/src/controls/Styles/Base/ComboBoxStyle.qml @@ -52,7 +52,7 @@ import QtQuick.Controls.Private 1.0 */ Style { - + id: style /*! \internal */ property var __syspal: SystemPalette { colorGroup: control.enabled ? @@ -65,7 +65,10 @@ Style { padding { top: 4 ; left: 6 ; right: 6 ; bottom:4 } /*! The size of the drop down button when the combobox is editable. */ - property int drowDownButtonWidth: Math.round(TextSingleton.implicitHeight) + property int dropDownButtonWidth: Math.round(TextSingleton.implicitHeight) + + /*! \internal Alias kept for backwards compatibility with a spelling mistake in 5.2.0) */ + property alias drowDownButtonWidth: style.dropDownButtonWidth /*! This defines the background of the button. */ property Component background: Item { @@ -100,7 +103,7 @@ Style { source: "images/arrow-down.png" anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - anchors.rightMargin: drowDownButtonWidth / 2 + anchors.rightMargin: dropDownButtonWidth / 2 opacity: control.enabled ? 0.6 : 0.3 } } @@ -175,7 +178,7 @@ Style { Loader { id: editorLoader anchors.fill: parent - anchors.rightMargin: drowDownButtonWidth + padding.right + anchors.rightMargin: dropDownButtonWidth + padding.right anchors.bottomMargin: -1 sourceComponent: control.editable ? __editor : null } diff --git a/src/controls/Styles/Desktop/ComboBoxStyle.qml b/src/controls/Styles/Desktop/ComboBoxStyle.qml index b36b4c1d..ef198d5e 100644 --- a/src/controls/Styles/Desktop/ComboBoxStyle.qml +++ b/src/controls/Styles/Desktop/ComboBoxStyle.qml @@ -46,7 +46,7 @@ import "." as Desktop Style { readonly property ComboBox control: __control - property int drowDownButtonWidth: 24 + property int dropDownButtonWidth: 24 property Component panel: Item { property bool popup: !!styleItem.styleHint("comboboxpopup") |