diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:22:58 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:22:58 +0100 |
| commit | 0f52a81f27e4ab8144e8784f04b190f23a4d49d9 (patch) | |
| tree | 0c69410fab38461c91212e94395252cadad9da09 /src/controls/Styles/Desktop/ComboBoxStyle.qml | |
| parent | d3c935f52c48e2eb1440cd329eaa152c42d03c6f (diff) | |
| parent | 66e1e0fee78f2b0a4412927ad39df4be564d15d1 (diff) | |
| download | qtquickcontrols-0f52a81f27e4ab8144e8784f04b190f23a4d49d9.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/controls/Styles/Base/ComboBoxStyle.qml
src/controls/Styles/Desktop/ComboBoxStyle.qml
src/layouts/qgridlayoutengine.cpp
Change-Id: I14298b9b3521fe220248e4b27e7057d538af5c49
Diffstat (limited to 'src/controls/Styles/Desktop/ComboBoxStyle.qml')
| -rw-r--r-- | src/controls/Styles/Desktop/ComboBoxStyle.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Styles/Desktop/ComboBoxStyle.qml b/src/controls/Styles/Desktop/ComboBoxStyle.qml index c679efec..d1b456b6 100644 --- a/src/controls/Styles/Desktop/ComboBoxStyle.qml +++ b/src/controls/Styles/Desktop/ComboBoxStyle.qml @@ -47,7 +47,7 @@ import "." as Desktop Style { readonly property ComboBox control: __control property int renderType: Text.NativeRendering - property int drowDownButtonWidth: 24 + property int dropDownButtonWidth: 24 property Component panel: Item { property bool popup: !!styleItem.styleHint("comboboxpopup") |