diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-10-17 15:59:06 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-18 13:43:54 +0200 |
| commit | 8480dcbc7180cf1bcafcd03a6ad7087c83582a97 (patch) | |
| tree | 98801a16b130666dadaebb615c6351c6b5685b6d /src/controls/qquickmenu.cpp | |
| parent | 12a49a3c0c38b7ac5599c7b421573721750d62f5 (diff) | |
| download | qtquickcontrols-8480dcbc7180cf1bcafcd03a6ad7087c83582a97.tar.gz | |
Menu: Extract QQuickMenuPopupWindow core popup behavior
... and put it in QQuickPopupWindow.
Change-Id: I6920f5c13904483310faae990c7199db9f1c4708
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/qquickmenu.cpp')
| -rw-r--r-- | src/controls/qquickmenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp index 600dbe79..361c4683 100644 --- a/src/controls/qquickmenu.cpp +++ b/src/controls/qquickmenu.cpp @@ -394,7 +394,7 @@ void QQuickMenu::__popup(qreal x, qreal y, int atItemIndex) m_popupWindow->setParentItem(visualItem()); else m_popupWindow->setParentWindow(parentWindow); - m_popupWindow->setMenuContentItem(m_menuContentItem); + m_popupWindow->setPopupContentItem(m_menuContentItem); m_popupWindow->setItemAt(atItem ? atItem->visualItem() : 0); connect(m_popupWindow, SIGNAL(visibleChanged(bool)), this, SLOT(windowVisibleChanged(bool))); @@ -435,7 +435,7 @@ void QQuickMenu::__dismissMenu() while (topMenuWindow) { QQuickMenuPopupWindow *pw = qobject_cast<QQuickMenuPopupWindow *>(topMenuWindow->transientParent()); if (!pw) - topMenuWindow->dismissMenu(); + topMenuWindow->dismissPopup(); topMenuWindow = pw; } } |