diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:07:24 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:07:24 +0200 |
| commit | 9898744e2ea17e805da559faeb677c9f5bbe080f (patch) | |
| tree | 36cb67cd6fa0e60d8bf9044ddd4623c5539b0baa /src/quicktemplates2/qquickmenubar_p_p.h | |
| parent | f5211d76cb92254af4a14d56599e5817f2368de8 (diff) | |
| parent | b395f94ec3032b11eed5708acf4e72244ea728c2 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I5da24592eb292ef4f430d734fec234166ce6e1e3
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); |