diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-27 22:04:58 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-27 22:13:52 +0200 |
commit | 8c47e08dfba62385f7255b88be0587485c6d2696 (patch) | |
tree | 01e61e004cdd88bd332e6368e0d82a72d1bd97ca /src/quicktemplates2/qquickmenu.cpp | |
parent | 150d8fcc7f97e4a5d56bdcf608fa22533d807677 (diff) | |
parent | 891afc345ba854414f5084b1b08eccb66eeaf54a (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ifb2d12d09994f3970b117ee76522c7d9c7152587
Diffstat (limited to 'src/quicktemplates2/qquickmenu.cpp')
-rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index c47b3fd2..fdebf6fb 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -92,6 +92,7 @@ QT_BEGIN_NAMESPACE */ QQuickMenuPrivate::QQuickMenuPrivate() : + contentItem(nullptr), contentModel(nullptr) { Q_Q(QQuickMenu); |