summaryrefslogtreecommitdiff
path: root/src/controls/ComboBox.qml
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2015-10-02 12:43:06 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-10-02 12:43:48 +0200
commit63d832bcae98104bf071096605fc27a59a52254c (patch)
treeba2fd42487c5889aad0b80aaddb0f304a690b561 /src/controls/ComboBox.qml
parent53ff51b61a3ecfc485d7c8ec6d9a5b61d2791719 (diff)
parenta21a33fe79e82a7bd3471612b46106ac1343648f (diff)
downloadqtquickcontrols-63d832bcae98104bf071096605fc27a59a52254c.tar.gz
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ie26c941c33fdd8baab49dc13b84d02e2b83af5e1
Diffstat (limited to 'src/controls/ComboBox.qml')
-rw-r--r--src/controls/ComboBox.qml3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index c5fed484..4e29dfe9 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -670,8 +670,7 @@ Control {
function toggleShow() {
if (popup.__popupVisible) {
- popup.__dismissMenu()
- popup.__destroyAllMenuPopups()
+ popup.__dismissAndDestroy()
} else {
if (items[__selectedIndex])
items[__selectedIndex].checked = true