diff options
| author | Marco Benelli <marco.benelli@theqtcompany.com> | 2015-07-23 10:45:23 +0200 |
|---|---|---|
| committer | Marco Benelli <marco.benelli@theqtcompany.com> | 2015-09-14 08:36:39 +0000 |
| commit | a7397a37145cd226f0a8a7bf89bd51cdc1b69025 (patch) | |
| tree | 3916abb89b91666aad1babfc2991931e9e469716 | |
| parent | 229473ebc5a6c64103565d34e7ada08ecbdcd76d (diff) | |
| download | qtquickcontrols-a7397a37145cd226f0a8a7bf89bd51cdc1b69025.tar.gz | |
Define __parentContentItem as null if __parentMenu is null.
Change-Id: I1b3f8fb8861499e55c34690580ad2d5d15dfa55f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| -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 7334c28c..037fa550 100644 --- a/src/controls/Menu.qml +++ b/src/controls/Menu.qml @@ -146,7 +146,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 */ |