diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-09 03:07:11 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-09 03:07:11 +0100 |
| commit | 6cc7a3cf11b25d18b0ddd8492a846ec2d724a28b (patch) | |
| tree | 6ff696c83f65d29f8fe8d184e449e51fa6d97b66 /src/quicktemplates2/qquickmenubar_p_p.h | |
| parent | 9eaa5bcb2e37f030e3f6e18f27d8f21c62d54d04 (diff) | |
| parent | 611422b5968ceac6cfba034116a3d1e107d8e2df (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I80f13e604dd492954c742e0ddaa7efa393776a62
Diffstat (limited to 'src/quicktemplates2/qquickmenubar_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickmenubar_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickmenubar_p_p.h b/src/quicktemplates2/qquickmenubar_p_p.h index 75fbed73..c214962b 100644 --- a/src/quicktemplates2/qquickmenubar_p_p.h +++ b/src/quicktemplates2/qquickmenubar_p_p.h @@ -69,7 +69,7 @@ public: QQmlListProperty<QQuickMenu> menus(); QQmlListProperty<QObject> contentData(); - QQuickItem *beginCreateItem(); + QQuickItem *beginCreateItem(QQuickMenu *menu); void completeCreateItem(); QQuickItem *createItem(QQuickMenu *menu); |