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_p.h | |
| 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_p.h')
| -rw-r--r-- | src/controls/qquickmenupopupwindow_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/controls/qquickmenupopupwindow_p.h b/src/controls/qquickmenupopupwindow_p.h index 750b8207..5cff75af 100644 --- a/src/controls/qquickmenupopupwindow_p.h +++ b/src/controls/qquickmenupopupwindow_p.h @@ -41,14 +41,14 @@ QT_BEGIN_NAMESPACE -class QQuickMenu; -class QQuickMenuBar; +class QQuickMenu1; +class QQuickMenuBar1; class QQuickMenuPopupWindow : public QQuickPopupWindow { Q_OBJECT public: - QQuickMenuPopupWindow(QQuickMenu *menu); + QQuickMenuPopupWindow(QQuickMenu1 *menu); void setItemAt(QQuickItem *menuItem); void setParentWindow(QWindow *effectiveParentWindow, QQuickWindow *parentWindow); @@ -56,7 +56,7 @@ public: void setParentItem(QQuickItem *); - QQuickMenu *menu() const; + QQuickMenu1 *menu() const; public Q_SLOTS: void setToBeDeletedLater(); @@ -76,7 +76,7 @@ private: QPointF m_oldItemPos; QPointF m_initialPos; QPointer<QQuickWindow> m_logicalParentWindow; - QQuickMenu *m_menu; + QQuickMenu1 *m_menu; }; QT_END_NAMESPACE |