diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:38:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:38:35 +0100 |
| commit | ad964dd36a56dcd071bb3527ee4957c607365cce (patch) | |
| tree | 1e916348677fa8ca974916b9f3e3fcb3a55d3b48 /src/controls/qquickmenuitemcontainer_p.h | |
| parent | e42603fd5b4efaa321dfc4417905510beafe288e (diff) | |
| parent | 148faf6278186986d1ca6afcdea0c361bcbf199e (diff) | |
| download | qtquickcontrols-ad964dd36a56dcd071bb3527ee4957c607365cce.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/controls/qquickmenubar.cpp
Change-Id: I4b036212b6dadded2c4d60dd07e91f629e80d9c2
Diffstat (limited to 'src/controls/qquickmenuitemcontainer_p.h')
| -rw-r--r-- | src/controls/qquickmenuitemcontainer_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/qquickmenuitemcontainer_p.h b/src/controls/qquickmenuitemcontainer_p.h index 02786f51..c34f2eb3 100644 --- a/src/controls/qquickmenuitemcontainer_p.h +++ b/src/controls/qquickmenuitemcontainer_p.h @@ -56,7 +56,7 @@ public: setParentMenu(0); } - void setParentMenu(QQuickMenu *parentMenu) + void setParentMenu(QQuickMenu1 *parentMenu) { QQuickMenuBase::setParentMenu(parentMenu); for (QQuickMenuBase *item : qAsConst(m_menuItems)) |