diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-05-14 16:47:59 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-05-14 16:47:59 +0200 |
| commit | ce4054c193ed3e6f578cbaa5dd30dfd69e765a6e (patch) | |
| tree | b17bbd0da004c5199a2eea5550e6a99d45bf26f0 /src/controls/ComboBox.qml | |
| parent | 5988cfda014ffbe8ab8640f84c4fc704335b205d (diff) | |
| parent | efbaa82fc79f3bee5486c12acf21e71cfaaed093 (diff) | |
| download | qtquickcontrols-ce4054c193ed3e6f578cbaa5dd30dfd69e765a6e.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/controls/Private/TabBar.qml
Change-Id: Id176e44fe8e402c1c2c021ecb63c8c5c75736d47
Diffstat (limited to 'src/controls/ComboBox.qml')
| -rw-r--r-- | src/controls/ComboBox.qml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml index c9f24b52..7a101969 100644 --- a/src/controls/ComboBox.qml +++ b/src/controls/ComboBox.qml @@ -354,7 +354,7 @@ Control { anchors.fill: parent anchors.leftMargin: 8 - anchors.rightMargin: __style.dropDownButtonWidth + anchors.rightMargin: __style.dropDownButtonWidth + __style.padding.right verticalAlignment: Text.AlignVCenter @@ -587,6 +587,8 @@ Control { if (__selectedIndex !== -1 && (selectedItem = items[__selectedIndex])) { input.editTextMatches = true selectedText = selectedItem.text + if (currentText !== selectedText) // __selectedIndex went form -1 to 0 + selectedTextChanged() } } } |