summaryrefslogtreecommitdiff
path: root/src/controls/ComboBox.qml
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@theqtcompany.com>2015-09-24 14:58:53 +0200
committerMitch Curtis <mitch.curtis@theqtcompany.com>2015-09-24 13:39:43 +0000
commit53ff51b61a3ecfc485d7c8ec6d9a5b61d2791719 (patch)
tree66018a04fbb8a0617c0fb3b2ece70d7665bfe330 /src/controls/ComboBox.qml
parentf22ea338a91c2e0bddc011762a64105e7d5698a0 (diff)
downloadqtquickcontrols-53ff51b61a3ecfc485d7c8ec6d9a5b61d2791719.tar.gz
Make ComboBox work with mixed controls versions
Due to what might be a bug in QML, we can't assign an ExclusiveGroup object to an ExclusiveGroup property. Since Menu has a default property, we can't create ExclusiveGroup as a child object, so we create it as a child of the control instead. Change-Id: I5860b72a09823da33b82b4fc884cf69590f1c63a Task-number: QTBUG-48240 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/ComboBox.qml')
-rw-r--r--src/controls/ComboBox.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index af1ecfe0..c5fed484 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -555,6 +555,8 @@ Control {
onTextRoleChanged: popup.resolveTextValue(textRole)
+ ExclusiveGroup { id: eg }
+
Menu {
id: popup
objectName: "popup"
@@ -580,8 +582,6 @@ Control {
__minimumWidth: comboBox.width
__visualItem: comboBox
- property ExclusiveGroup eg: ExclusiveGroup { id: eg }
-
property bool modelIsArray: false
Instantiator {