diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-08-16 10:36:19 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-10-02 09:04:56 +0000 |
| commit | d923dd467c1aeb3e195a09949b04862084002f88 (patch) | |
| tree | 3d2ad3ab4d4989009195094bebd39276912dc5e1 /src/quicktemplates2/qquickmenubar_p_p.h | |
| parent | e7213c0460788f49ec6c2204bfd5c0517699aa51 (diff) | |
MenuBar: ensure the correct delegates are used when created via Component
Don't add items until we're complete, as the delegate could change in
the meantime. Instead, add them to contentData and create them when
we're complete.
A similar fix was already done for Menu in d5cb26bc.
Task-number: QTBUG-67559
Change-Id: Idb43b7a69fcf1c1ad6396c73a3c090b92e460ab8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickmenubar_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickmenubar_p_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickmenubar_p_p.h b/src/quicktemplates2/qquickmenubar_p_p.h index b6fdc9eb..24824292 100644 --- a/src/quicktemplates2/qquickmenubar_p_p.h +++ b/src/quicktemplates2/qquickmenubar_p_p.h @@ -66,6 +66,8 @@ public: return menuBar->d_func(); } + void createItems(); + QQuickItem *beginCreateItem(); void completeCreateItem(); |