Commit 6d17b2f9 authored by Caroline Chao's avatar Caroline Chao Committed by The Qt Project
Browse files

ComboBox: Fix warning when model not ready


Task-number: QTBUG-31135

Change-Id: I0d9b0a3cf9d1036e6940e10944c711cdd23d858a
Reviewed-by: default avatarGabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: default avatarCaroline Chao <caroline.chao@digia.com>
parent fad08d64
6.2 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 dev old/5.1 old/5.2 wip/calendar wip/tizen v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1
No related merge requests found
Showing with 6 additions and 2 deletions
...@@ -146,7 +146,7 @@ Control { ...@@ -146,7 +146,7 @@ Control {
Instantiator { Instantiator {
id: popupItems id: popupItems
active: popup.ready active: false
MenuItem { MenuItem {
text: popup.textRole === '' ? text: popup.textRole === '' ?
modelData : modelData :
...@@ -157,11 +157,14 @@ Control { ...@@ -157,11 +157,14 @@ Control {
} }
onObjectAdded: popup.insertItem(index, object) onObjectAdded: popup.insertItem(index, object)
onObjectRemoved: popup.removeItem(object) onObjectRemoved: popup.removeItem(object)
} }
function resolveTextValue(initialTextRole) { function resolveTextValue(initialTextRole) {
if (!ready || !model) if (!ready || !model) {
popupItems.active = false
return; return;
}
var get = model['get']; var get = model['get'];
if (!get && popup.__modelIsArray) { if (!get && popup.__modelIsArray) {
...@@ -192,6 +195,7 @@ Control { ...@@ -192,6 +195,7 @@ Control {
textRole = roleName textRole = roleName
} }
} }
popupItems.active = true
} }
function show() { function show() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment