diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-16 00:10:56 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-16 12:40:51 +0000 |
| commit | dca7048361d7bae21d5b5d6715c725f1b3d62d1e (patch) | |
| tree | e754035c26f65220207b3b576a2271f956d57b04 /src/controls/qquickmenupopupwindow.cpp | |
| parent | add9875ec266351e7c2878a1e93da34181abab29 (diff) | |
| download | qtquickcontrols-dca7048361d7bae21d5b5d6715c725f1b3d62d1e.tar.gz | |
Suffix QQuickMenu, QQuickMenuBar & QQuickMenuItem with 1
This avoids clashes between Qt Quick Controls and Qt Labs Controls.
Change-Id: Ia1d367c271a3c80259d4f59be891c211ec061e01
Task-number: QTBUG-49794
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/controls/qquickmenupopupwindow.cpp')
| -rw-r--r-- | src/controls/qquickmenupopupwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/qquickmenupopupwindow.cpp b/src/controls/qquickmenupopupwindow.cpp index 9385be46..8d821d84 100644 --- a/src/controls/qquickmenupopupwindow.cpp +++ b/src/controls/qquickmenupopupwindow.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -QQuickMenuPopupWindow::QQuickMenuPopupWindow(QQuickMenu *menu) : +QQuickMenuPopupWindow::QQuickMenuPopupWindow(QQuickMenu1 *menu) : m_itemAt(0), m_logicalParentWindow(0), m_menu(menu) @@ -163,7 +163,7 @@ void QQuickMenuPopupWindow::exposeEvent(QExposeEvent *e) updateSize(); } -QQuickMenu *QQuickMenuPopupWindow::menu() const +QQuickMenu1 *QQuickMenuPopupWindow::menu() const { return m_menu; } @@ -172,7 +172,7 @@ bool QQuickMenuPopupWindow::shouldForwardEventAfterDismiss(QMouseEvent *e) const { // If the event falls inside this item the event should not be forwarded. // For example for comboboxes or top menus of the menubar - QQuickMenuBar *mb = m_menu ? m_menu->menuBar() : Q_NULLPTR; + QQuickMenuBar1 *mb = m_menu ? m_menu->menuBar() : Q_NULLPTR; QQuickItem *item = mb && !mb->isNative() ? mb->contentItem() : menu()->visualItem(); QWindow *window = transientParent(); if (item && window && item->window() == window) { |