summaryrefslogtreecommitdiff
path: root/src/controls/Private
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2014-02-18 17:29:10 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-20 17:54:37 +0100
commitcc4b659ac12f3ce6ff821ca3e22676608ac6bc7b (patch)
tree92061257e5879e8e1590d592d011d8b50f7f07d0 /src/controls/Private
parentc29877850f44d0fc4e2164295beb2bded5f4aa30 (diff)
downloadqtquickcontrols-cc4b659ac12f3ce6ff821ca3e22676608ac6bc7b.tar.gz
MenuContentItem: Remove scroller indicator style warning
Change-Id: I3d50ba06c790d44a2db4195e3ad1f8d5aebc2a12 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/Private')
-rw-r--r--src/controls/Private/MenuContentItem.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Private/MenuContentItem.qml b/src/controls/Private/MenuContentItem.qml
index 44312fa5..d5d6f69d 100644
--- a/src/controls/Private/MenuContentItem.qml
+++ b/src/controls/Private/MenuContentItem.qml
@@ -160,7 +160,7 @@ Loader {
x: d.style ? d.style.padding.left : 0
y: d.style ? d.style.padding.top : 0
menuItemDelegate: menuItemComponent
- scrollIndicatorStyle: d.style && d.style.scrollIndicator
+ scrollIndicatorStyle: d.style && d.style.scrollIndicator || null
scrollerStyle: d.style && d.style.__scrollerStyle
itemsModel: __menu.items
minWidth: __menu.__minimumWidth