diff options
| author | Filippo Cucchetto <filippocucchetto@gmail.com> | 2015-04-06 20:52:15 +0200 |
|---|---|---|
| committer | Filippo Cucchetto <filippocucchetto@gmail.com> | 2015-04-13 11:49:42 +0000 |
| commit | d9d9dd16da54b6b40c37b8e1e9c2394422835ab0 (patch) | |
| tree | 2dba312f198535063574a4a4bc1da355cf8ac4f7 /src/controls/qquickmenupopupwindow.cpp | |
| parent | 74d33bfb7c51643a38f4968d084689a9d8ef96b7 (diff) | |
| download | qtquickcontrols-d9d9dd16da54b6b40c37b8e1e9c2394422835ab0.tar.gz | |
Added QQuickMenu reference in QQuickMenuPopupWindow
QQuickMenuPopupWindow has not direct reference to the QQuickMenu that
created it.
This is useful for navigating back from the popup to the QQuickMenu
Change-Id: I6b11641ef90c423df9961277bb3e89573d1ed0e0
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Diffstat (limited to 'src/controls/qquickmenupopupwindow.cpp')
| -rw-r--r-- | src/controls/qquickmenupopupwindow.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/controls/qquickmenupopupwindow.cpp b/src/controls/qquickmenupopupwindow.cpp index 52063979..f5719908 100644 --- a/src/controls/qquickmenupopupwindow.cpp +++ b/src/controls/qquickmenupopupwindow.cpp @@ -41,12 +41,14 @@ #include <qquickitem.h> #include <QtGui/QScreen> #include <QtQuick/QQuickRenderControl> +#include "qquickmenu_p.h" QT_BEGIN_NAMESPACE -QQuickMenuPopupWindow::QQuickMenuPopupWindow() : +QQuickMenuPopupWindow::QQuickMenuPopupWindow(QQuickMenu *menu) : m_itemAt(0), - m_logicalParentWindow(0) + m_logicalParentWindow(0), + m_menu(menu) { } @@ -144,4 +146,9 @@ void QQuickMenuPopupWindow::exposeEvent(QExposeEvent *e) QQuickPopupWindow::exposeEvent(e); } +QQuickMenu *QQuickMenuPopupWindow::menu() const +{ + return m_menu; +} + QT_END_NAMESPACE |