diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-10-02 12:43:06 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-10-02 12:43:48 +0200 |
| commit | 63d832bcae98104bf071096605fc27a59a52254c (patch) | |
| tree | ba2fd42487c5889aad0b80aaddb0f304a690b561 /src/controls/Menu.qml | |
| parent | 53ff51b61a3ecfc485d7c8ec6d9a5b61d2791719 (diff) | |
| parent | a21a33fe79e82a7bd3471612b46106ac1343648f (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ie26c941c33fdd8baab49dc13b84d02e2b83af5e1
Diffstat (limited to 'src/controls/Menu.qml')
| -rw-r--r-- | src/controls/Menu.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml index 95378670a..d485cb652 100644 --- a/src/controls/Menu.qml +++ b/src/controls/Menu.qml @@ -147,7 +147,7 @@ MenuPrivate { /*! \internal */ property bool __usingDefaultStyle: false /*! \internal */ - property var __parentContentItem: __parentMenu.__contentItem + property var __parentContentItem: __parentMenu ? __parentMenu.__contentItem : null /*! \internal */ property int __currentIndex: -1 /*! \internal */ |