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>

11 files changed, 150 insertions, 150 deletions

diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp
index b4a4963d..da670dc8 100644
--- a/src/controls/plugin.cpp
+++ b/src/controls/plugin.cpp
@@ -123,7 +123,7 @@ void QtQuickControlsPlugin::registerTypes(const char *uri)
     initResources();
     qmlRegisterType<QQuickAction>(uri, 1, 0, "Action");
     qmlRegisterType<QQuickExclusiveGroup1>(uri, 1, 0, "ExclusiveGroup");
-    qmlRegisterType<QQuickMenuItem>(uri, 1, 0, "MenuItem");
+    qmlRegisterType<QQuickMenuItem1>(uri, 1, 0, "MenuItem");
     qmlRegisterUncreatableType<QQuickMenuItemType>(uri, 1, 0, "MenuItemType",
                                                    QLatin1String("Do not create objects of type MenuItemType"));
     qmlRegisterType<QQuickMenuSeparator>(uri, 1, 0, "MenuSeparator");
@@ -161,8 +161,8 @@ void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri
     qmlRegisterType<QQuickTreeModelAdaptor>(private_uri, 1, 0, "TreeModelAdaptor");
     qmlRegisterType<QQuickScenePosListener>(private_uri, 1, 0, "ScenePosListener");
 
-    qmlRegisterType<QQuickMenu>(private_uri, 1, 0, "MenuPrivate");
-    qmlRegisterType<QQuickMenuBar>(private_uri, 1, 0, "MenuBarPrivate");
+    qmlRegisterType<QQuickMenu1>(private_uri, 1, 0, "MenuPrivate");
+    qmlRegisterType<QQuickMenuBar1>(private_uri, 1, 0, "MenuBarPrivate");
     qmlRegisterType<QQuickPopupWindow>(private_uri, 1, 0, "PopupWindow");
 
     qmlRegisterUncreatableType<QAbstractItemModel>(private_uri, 1, 0, "AbstractItemModel",
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp
index e7cd62b5..6ae20ff1 100644
--- a/src/controls/qquickmenu.cpp
+++ b/src/controls/qquickmenu.cpp
@@ -51,13 +51,13 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-  \class QQuickMenu
+  \class QQuickMenu1
   \internal
  */
 
 /*!
   \qmltype MenuPrivate
-  \instantiates QQuickMenu
+  \instantiates QQuickMenu1
   \internal
   \inqmlmodule QtQuick.Controls
  */
@@ -254,7 +254,7 @@ QT_BEGIN_NAMESPACE
     \sa aboutToShow()
 */
 
-QQuickMenu::QQuickMenu(QObject *parent)
+QQuickMenu1::QQuickMenu1(QObject *parent)
     : QQuickMenuText(parent, QQuickMenuItemType::Menu),
       m_itemsCount(0),
       m_selectedIndex(-1),
@@ -282,7 +282,7 @@ QQuickMenu::QQuickMenu(QObject *parent)
         m_font = *const_cast<QFont*>(font);
 }
 
-QQuickMenu::~QQuickMenu()
+QQuickMenu1::~QQuickMenu1()
 {
     while (!m_menuItems.empty()) {
         QQuickMenuBase *item = m_menuItems.takeFirst();
@@ -297,14 +297,14 @@ QQuickMenu::~QQuickMenu()
     m_platformMenu = 0;
 }
 
-void QQuickMenu::syncParentMenuBar()
+void QQuickMenu1::syncParentMenuBar()
 {
-    QQuickMenuBar *menubar = qobject_cast<QQuickMenuBar *>(parent());
+    QQuickMenuBar1 *menubar = qobject_cast<QQuickMenuBar1 *>(parent());
     if (menubar && menubar->platformMenuBar())
         menubar->platformMenuBar()->syncMenu(m_platformMenu);
 }
 
-void QQuickMenu::setVisible(bool v)
+void QQuickMenu1::setVisible(bool v)
 {
     QQuickMenuBase::setVisible(v);
     if (m_platformMenu) {
@@ -313,7 +313,7 @@ void QQuickMenu::setVisible(bool v)
     }
 }
 
-void QQuickMenu::setEnabled(bool e)
+void QQuickMenu1::setEnabled(bool e)
 {
     QQuickMenuText::setEnabled(e);
     if (m_platformMenu) {
@@ -322,14 +322,14 @@ void QQuickMenu::setEnabled(bool e)
     }
 }
 
-void QQuickMenu::updateText()
+void QQuickMenu1::updateText()
 {
     if (m_platformMenu)
         m_platformMenu->setText(this->text());
     QQuickMenuText::updateText();
 }
 
-void QQuickMenu::setMinimumWidth(int w)
+void QQuickMenu1::setMinimumWidth(int w)
 {
     if (w == m_minimumWidth)
         return;
@@ -341,7 +341,7 @@ void QQuickMenu::setMinimumWidth(int w)
     emit minimumWidthChanged();
 }
 
-void QQuickMenu::setFont(const QFont &arg)
+void QQuickMenu1::setFont(const QFont &arg)
 {
     if (arg == m_font)
         return;
@@ -351,17 +351,17 @@ void QQuickMenu::setFont(const QFont &arg)
         m_platformMenu->setFont(arg);
 }
 
-void QQuickMenu::setXOffset(qreal x)
+void QQuickMenu1::setXOffset(qreal x)
 {
     m_xOffset = x;
 }
 
-void QQuickMenu::setYOffset(qreal y)
+void QQuickMenu1::setYOffset(qreal y)
 {
     m_yOffset = y;
 }
 
-void QQuickMenu::setSelectedIndex(int index)
+void QQuickMenu1::setSelectedIndex(int index)
 {
     if (m_selectedIndex == index)
         return;
@@ -370,21 +370,21 @@ void QQuickMenu::setSelectedIndex(int index)
     emit __selectedIndexChanged();
 }
 
-void QQuickMenu::updateSelectedIndex()
+void QQuickMenu1::updateSelectedIndex()
 {
-    if (QQuickMenuItem *menuItem = qobject_cast<QQuickMenuItem*>(sender())) {
+    if (QQuickMenuItem1 *menuItem = qobject_cast<QQuickMenuItem1*>(sender())) {
         int index = indexOfMenuItem(menuItem);
         setSelectedIndex(index);
     }
 }
 
-QQuickMenuItems QQuickMenu::menuItems()
+QQuickMenuItems QQuickMenu1::menuItems()
 {
-    return QQuickMenuItems(this, 0, &QQuickMenu::append_menuItems, &QQuickMenu::count_menuItems,
-                       &QQuickMenu::at_menuItems, &QQuickMenu::clear_menuItems);
+    return QQuickMenuItems(this, 0, &QQuickMenu1::append_menuItems, &QQuickMenu1::count_menuItems,
+                       &QQuickMenu1::at_menuItems, &QQuickMenu1::clear_menuItems);
 }
 
-QQuickWindow *QQuickMenu::findParentWindow()
+QQuickWindow *QQuickMenu1::findParentWindow()
 {
     if (!m_parentWindow) {
         QQuickItem *parentAsItem = qobject_cast<QQuickItem *>(parent());
@@ -394,7 +394,7 @@ QQuickWindow *QQuickMenu::findParentWindow()
     return m_parentWindow;
 }
 
-void QQuickMenu::popup()
+void QQuickMenu1::popup()
 {
     QQuickWindow *quickWindow = findParentWindow();
     QPoint renderOffset;
@@ -414,7 +414,7 @@ void QQuickMenu::popup()
     __popup(QRectF(mousePos.x() - renderOffset.x(), mousePos.y() - renderOffset.y(), 0, 0));
 }
 
-void QQuickMenu::__popup(const QRectF &targetRect, int atItemIndex, MenuType menuType)
+void QQuickMenu1::__popup(const QRectF &targetRect, int atItemIndex, MenuType menuType)
 {
     if (popupVisible()) {
         hideMenu();
@@ -466,7 +466,7 @@ void QQuickMenu::__popup(const QRectF &targetRect, int atItemIndex, MenuType men
     }
 }
 
-void QQuickMenu::setMenuContentItem(QQuickItem *item)
+void QQuickMenu1::setMenuContentItem(QQuickItem *item)
 {
     if (m_menuContentItem != item) {
         m_menuContentItem = item;
@@ -474,7 +474,7 @@ void QQuickMenu::setMenuContentItem(QQuickItem *item)
     }
 }
 
-void QQuickMenu::setPopupVisible(bool v)
+void QQuickMenu1::setPopupVisible(bool v)
 {
     if (m_popupVisible != v) {
         m_popupVisible = v;
@@ -482,7 +482,7 @@ void QQuickMenu::setPopupVisible(bool v)
     }
 }
 
-QRect QQuickMenu::popupGeometry() const
+QRect QQuickMenu1::popupGeometry() const
 {
     if (!m_popupWindow || !m_popupVisible)
         return QRect();
@@ -490,13 +490,13 @@ QRect QQuickMenu::popupGeometry() const
     return m_popupWindow->geometry();
 }
 
-void QQuickMenu::prepareItemTrigger(QQuickMenuItem *)
+void QQuickMenu1::prepareItemTrigger(QQuickMenuItem1 *)
 {
     m_triggerCount++;
     __dismissMenu();
 }
 
-void QQuickMenu::concludeItemTrigger(QQuickMenuItem *)
+void QQuickMenu1::concludeItemTrigger(QQuickMenuItem1 *)
 {
     if (--m_triggerCount == 0)
         destroyAllMenuPopups();
@@ -506,7 +506,7 @@ void QQuickMenu::concludeItemTrigger(QQuickMenuItem *)
  * \internal
  * Close this menu's popup window. Emits aboutToHide and sets __popupVisible to false.
  */
-void QQuickMenu::hideMenu()
+void QQuickMenu1::hideMenu()
 {
     if (m_popupVisible) {
         emit aboutToHide();
@@ -517,7 +517,7 @@ void QQuickMenu::hideMenu()
     m_parentWindow = 0;
 }
 
-QQuickMenuPopupWindow *QQuickMenu::topMenuPopup() const
+QQuickMenuPopupWindow *QQuickMenu1::topMenuPopup() const
 {
     QQuickMenuPopupWindow *topMenuWindow = m_popupWindow;
     while (topMenuWindow) {
@@ -536,7 +536,7 @@ QQuickMenuPopupWindow *QQuickMenu::topMenuPopup() const
  * In QQuickPopupWindow, before closing, dismissPopup() emits popupDismissed()
  * which is connected to dismissPopup() on any child popup.
  */
-void QQuickMenu::__dismissMenu()
+void QQuickMenu1::__dismissMenu()
 {
     if (m_platformMenu) {
         m_platformMenu->dismiss();
@@ -549,7 +549,7 @@ void QQuickMenu::__dismissMenu()
  * \internal
  * Called when the popup window visible property changes.
  */
-void QQuickMenu::windowVisibleChanged(bool v)
+void QQuickMenu1::windowVisibleChanged(bool v)
 {
     if (!v) {
         if (m_popupWindow) {
@@ -564,13 +564,13 @@ void QQuickMenu::windowVisibleChanged(bool v)
     }
 }
 
-void QQuickMenu::clearPopupWindow()
+void QQuickMenu1::clearPopupWindow()
 {
     m_popupWindow = 0;
     emit __menuPopupDestroyed();
 }
 
-void QQuickMenu::destroyMenuPopup()
+void QQuickMenu1::destroyMenuPopup()
 {
     if (m_triggerCount > 0)
         return;
@@ -578,7 +578,7 @@ void QQuickMenu::destroyMenuPopup()
         m_popupWindow->setToBeDeletedLater();
 }
 
-void QQuickMenu::destroyAllMenuPopups() {
+void QQuickMenu1::destroyAllMenuPopups() {
     if (m_triggerCount > 0)
         return;
     QQuickMenuPopupWindow *popup = topMenuPopup();
@@ -586,13 +586,13 @@ void QQuickMenu::destroyAllMenuPopups() {
         popup->setToBeDeletedLater();
 }
 
-QQuickMenuBar *QQuickMenu::menuBar()
+QQuickMenuBar1 *QQuickMenu1::menuBar()
 {
     QObject *pi = parentMenuOrMenuBar();
     while (pi) {
-        if (QQuickMenuBar *menuBar = qobject_cast<QQuickMenuBar*>(pi))
+        if (QQuickMenuBar1 *menuBar = qobject_cast<QQuickMenuBar1*>(pi))
             return menuBar;
-        else if (QQuickMenu *menu = qobject_cast<QQuickMenu*>(pi))
+        else if (QQuickMenu1 *menu = qobject_cast<QQuickMenu1*>(pi))
             pi = menu->parentMenuOrMenuBar();
         else
             return 0;
@@ -600,13 +600,13 @@ QQuickMenuBar *QQuickMenu::menuBar()
     return 0;
 }
 
-void QQuickMenu::__closeAndDestroy()
+void QQuickMenu1::__closeAndDestroy()
 {
     hideMenu();
     destroyMenuPopup();
 }
 
-void QQuickMenu::__dismissAndDestroy()
+void QQuickMenu1::__dismissAndDestroy()
 {
     if (m_platformMenu)
         return;
@@ -615,7 +615,7 @@ void QQuickMenu::__dismissAndDestroy()
     destroyAllMenuPopups();
 }
 
-void QQuickMenu::itemIndexToListIndex(int itemIndex, int *listIndex, int *containerIndex) const
+void QQuickMenu1::itemIndexToListIndex(int itemIndex, int *listIndex, int *containerIndex) const
 {
     *listIndex = -1;
     QQuickMenuItemContainer *container = 0;
@@ -631,7 +631,7 @@ void QQuickMenu::itemIndexToListIndex(int itemIndex, int *listIndex, int *contai
         *containerIndex = -1;
 }
 
-int QQuickMenu::itemIndexForListIndex(int listIndex) const
+int QQuickMenu1::itemIndexForListIndex(int listIndex) const
 {
     int index = 0;
     int i = 0;
@@ -644,7 +644,7 @@ int QQuickMenu::itemIndexForListIndex(int listIndex) const
     return index;
 }
 
-QQuickMenuBase *QQuickMenu::nextMenuItem(QQuickMenu::MenuItemIterator *it) const
+QQuickMenuBase *QQuickMenu1::nextMenuItem(QQuickMenu1::MenuItemIterator *it) const
 {
     if (it->containerIndex != -1) {
         QQuickMenuItemContainer *container = qobject_cast<QQuickMenuItemContainer *>(m_menuItems[it->index]);
@@ -665,7 +665,7 @@ QQuickMenuBase *QQuickMenu::nextMenuItem(QQuickMenu::MenuItemIterator *it) const
     return 0;
 }
 
-QQuickMenuBase *QQuickMenu::menuItemAtIndex(int index) const
+QQuickMenuBase *QQuickMenu1::menuItemAtIndex(int index) const
 {
     if (0 <= index && index < m_itemsCount) {
         if (!m_containersCount) {
@@ -689,7 +689,7 @@ QQuickMenuBase *QQuickMenu::menuItemAtIndex(int index) const
     return 0;
 }
 
-bool QQuickMenu::contains(QQuickMenuBase *item)
+bool QQuickMenu1::contains(QQuickMenuBase *item)
 {
     if (item->container())
         return item->container()->items().contains(item);
@@ -697,7 +697,7 @@ bool QQuickMenu::contains(QQuickMenuBase *item)
     return m_menuItems.contains(item);
 }
 
-int QQuickMenu::indexOfMenuItem(QQuickMenuBase *item) const
+int QQuickMenu1::indexOfMenuItem(QQuickMenuBase *item) const
 {
     if (!item)
         return -1;
@@ -713,31 +713,31 @@ int QQuickMenu::indexOfMenuItem(QQuickMenuBase *item) const
     }
 }
 
-QQuickMenuItem *QQuickMenu::addItem(const QString &title)
+QQuickMenuItem1 *QQuickMenu1::addItem(const QString &title)
 {
     return insertItem(m_itemsCount, title);
 }
 
-QQuickMenuItem *QQuickMenu::insertItem(int index, const QString &title)
+QQuickMenuItem1 *QQuickMenu1::insertItem(int index, const QString &title)
 {
-    QQuickMenuItem *item = new QQuickMenuItem(this);
+    QQuickMenuItem1 *item = new QQuickMenuItem1(this);
     item->setText(title);
     insertItem(index, item);
     return item;
 }
 
-void QQuickMenu::addSeparator()
+void QQuickMenu1::addSeparator()
 {
     insertSeparator(m_itemsCount);
 }
 
-void QQuickMenu::insertSeparator(int index)
+void QQuickMenu1::insertSeparator(int index)
 {
     QQuickMenuSeparator *item = new QQuickMenuSeparator(this);
     insertItem(index, item);
 }
 
-void QQuickMenu::insertItem(int index, QQuickMenuBase *menuItem)
+void QQuickMenu1::insertItem(int index, QQuickMenuBase *menuItem)
 {
     if (!menuItem)
         return;
@@ -760,7 +760,7 @@ void QQuickMenu::insertItem(int index, QQuickMenuBase *menuItem)
     emit itemsChanged();
 }
 
-void QQuickMenu::removeItem(QQuickMenuBase *menuItem)
+void QQuickMenu1::removeItem(QQuickMenuBase *menuItem)
 {
     if (!menuItem)
         return;
@@ -776,7 +776,7 @@ void QQuickMenu::removeItem(QQuickMenuBase *menuItem)
     emit itemsChanged();
 }
 
-void QQuickMenu::clear()
+void QQuickMenu1::clear()
 {
     m_containers.clear();
     m_containersCount = 0;
@@ -791,7 +791,7 @@ void QQuickMenu::clear()
     m_itemsCount = 0;
 }
 
-void QQuickMenu::setupMenuItem(QQuickMenuBase *item, int platformIndex)
+void QQuickMenu1::setupMenuItem(QQuickMenuBase *item, int platformIndex)
 {
     item->setParentMenu(this);
     if (m_platformMenu) {
@@ -803,9 +803,9 @@ void QQuickMenu::setupMenuItem(QQuickMenuBase *item, int platformIndex)
     ++m_itemsCount;
 }
 
-void QQuickMenu::append_menuItems(QQuickMenuItems *list, QObject *o)
+void QQuickMenu1::append_menuItems(QQuickMenuItems *list, QObject *o)
 {
-    if (QQuickMenu *menu = qobject_cast<QQuickMenu *>(list->object)) {
+    if (QQuickMenu1 *menu = qobject_cast<QQuickMenu1 *>(list->object)) {
         if (QQuickMenuBase *menuItem = qobject_cast<QQuickMenuBase *>(o)) {
             menu->m_menuItems.append(menuItem);
             menu->setupMenuItem(menuItem);
@@ -825,25 +825,25 @@ void QQuickMenu::append_menuItems(QQuickMenuItems *list, QObject *o)
     }
 }
 
-int QQuickMenu::count_menuItems(QQuickMenuItems *list)
+int QQuickMenu1::count_menuItems(QQuickMenuItems *list)
 {
-    if (QQuickMenu *menu = qobject_cast<QQuickMenu *>(list->object))
+    if (QQuickMenu1 *menu = qobject_cast<QQuickMenu1 *>(list->object))
         return menu->m_itemsCount;
 
     return 0;
 }
 
-QObject *QQuickMenu::at_menuItems(QQuickMenuItems *list, int index)
+QObject *QQuickMenu1::at_menuItems(QQuickMenuItems *list, int index)
 {
-    if (QQuickMenu *menu = qobject_cast<QQuickMenu *>(list->object))
+    if (QQuickMenu1 *menu = qobject_cast<QQuickMenu1 *>(list->object))
         return menu->menuItemAtIndex(index);
 
     return 0;
 }
 
-void QQuickMenu::clear_menuItems(QQuickMenuItems *list)
+void QQuickMenu1::clear_menuItems(QQuickMenuItems *list)
 {
-    if (QQuickMenu *menu = qobject_cast<QQuickMenu *>(list->object))
+    if (QQuickMenu1 *menu = qobject_cast<QQuickMenu1 *>(list->object))
         menu->clear();
 }
 
diff --git a/src/controls/qquickmenu_p.h b/src/controls/qquickmenu_p.h
index 8e881fb4..576ae5fd 100644
--- a/src/controls/qquickmenu_p.h
+++ b/src/controls/qquickmenu_p.h
@@ -51,11 +51,11 @@ class QPlatformMenu;
 class QQuickMenuPopupWindow;
 class QQuickMenuItemContainer;
 class QQuickWindow;
-class QQuickMenuBar;
+class QQuickMenuBar1;
 
 typedef QQmlListProperty<QObject> QQuickMenuItems;
 
-class QQuickMenu : public QQuickMenuText
+class QQuickMenu1 : public QQuickMenuText
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ text WRITE setText NOTIFY titleChanged)
@@ -79,8 +79,8 @@ public:
     enum MenuType { DefaultMenu = 0, EditMenu };
 
     Q_INVOKABLE void popup();
-    Q_INVOKABLE QQuickMenuItem *addItem(const QString &);
-    Q_INVOKABLE QQuickMenuItem *insertItem(int, const QString &);
+    Q_INVOKABLE QQuickMenuItem1 *addItem(const QString &);
+    Q_INVOKABLE QQuickMenuItem1 *insertItem(int, const QString &);
     Q_INVOKABLE void addSeparator();
     Q_INVOKABLE void insertSeparator(int);
 
@@ -111,8 +111,8 @@ Q_SIGNALS:
     void __proxyChanged();
 
 public:
-    QQuickMenu(QObject *parent = 0);
-    virtual ~QQuickMenu();
+    QQuickMenu1(QObject *parent = 0);
+    virtual ~QQuickMenu1();
 
     void setVisible(bool);
     void setEnabled(bool);
@@ -148,12 +148,12 @@ public:
     bool isProxy() const { return m_proxy; }
     void setProxy(bool proxy) { if (m_proxy != proxy) { m_proxy = proxy; emit __proxyChanged(); } }
 
-    void prepareItemTrigger(QQuickMenuItem *);
-    void concludeItemTrigger(QQuickMenuItem *);
+    void prepareItemTrigger(QQuickMenuItem1 *);
+    void concludeItemTrigger(QQuickMenuItem1 *);
     void destroyMenuPopup();
     void destroyAllMenuPopups();
 
-    QQuickMenuBar *menuBar();
+    QQuickMenuBar1 *menuBar();
 
 protected Q_SLOTS:
     void updateSelectedIndex();
@@ -209,6 +209,6 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickMenu)
+QML_DECLARE_TYPE(QQuickMenu1)
 
 #endif // QQUICKMENU_P_H
diff --git a/src/controls/qquickmenubar.cpp b/src/controls/qquickmenubar.cpp
index efec6510..b795cd98 100644
--- a/src/controls/qquickmenubar.cpp
+++ b/src/controls/qquickmenubar.cpp
@@ -45,13 +45,13 @@ QT_BEGIN_NAMESPACE
 
 
 /*!
-  \class QQuickMenuBar
+  \class QQuickMenuBar1
   \internal
  */
 
 /*!
   \qmltype MenuBarPrivate
-  \instantiates QQuickMenuBar
+  \instantiates QQuickMenuBar1
   \internal
   \inqmlmodule QtQuick.Controls
  */
@@ -65,28 +65,28 @@ QT_BEGIN_NAMESPACE
     \sa Menu
 */
 
-QQuickMenuBar::QQuickMenuBar(QObject *parent)
+QQuickMenuBar1::QQuickMenuBar1(QObject *parent)
     : QObject(parent), m_platformMenuBar(0), m_contentItem(0), m_parentWindow(0)
 {
 }
 
-QQuickMenuBar::~QQuickMenuBar()
+QQuickMenuBar1::~QQuickMenuBar1()
 {
     if (isNative())
         setNativeNoNotify(false);
 }
 
-QQmlListProperty<QQuickMenu> QQuickMenuBar::menus()
+QQmlListProperty<QQuickMenu1> QQuickMenuBar1::menus()
 {
-    return QQmlListProperty<QQuickMenu>(this, 0, &QQuickMenuBar::append_menu, &QQuickMenuBar::count_menu, &QQuickMenuBar::at_menu, 0);
+    return QQmlListProperty<QQuickMenu1>(this, 0, &QQuickMenuBar1::append_menu, &QQuickMenuBar1::count_menu, &QQuickMenuBar1::at_menu, 0);
 }
 
-bool QQuickMenuBar::isNative() const
+bool QQuickMenuBar1::isNative() const
 {
     return m_platformMenuBar != 0;
 }
 
-void QQuickMenuBar::setNative(bool native)
+void QQuickMenuBar1::setNative(bool native)
 {
     bool wasNative = isNative();
     setNativeNoNotify(native);
@@ -94,20 +94,20 @@ void QQuickMenuBar::setNative(bool native)
         emit nativeChanged();
 }
 
-void QQuickMenuBar::setNativeNoNotify(bool native)
+void QQuickMenuBar1::setNativeNoNotify(bool native)
 {
     if (native) {
         if (!m_platformMenuBar) {
             m_platformMenuBar = QGuiApplicationPrivate::platformTheme()->createPlatformMenuBar();
             if (m_platformMenuBar) {
                 m_platformMenuBar->handleReparent(m_parentWindow);
-                foreach (QQuickMenu *menu, m_menus)
+                foreach (QQuickMenu1 *menu, m_menus)
                     m_platformMenuBar->insertMenu(menu->platformMenu(), 0 /* append */);
             }
         }
     } else {
         if (m_platformMenuBar) {
-            foreach (QQuickMenu *menu, m_menus)
+            foreach (QQuickMenu1 *menu, m_menus)
                 m_platformMenuBar->removeMenu(menu->platformMenu());
         }
         delete m_platformMenuBar;
@@ -115,7 +115,7 @@ void QQuickMenuBar::setNativeNoNotify(bool native)
     }
 }
 
-void QQuickMenuBar::setContentItem(QQuickItem *item)
+void QQuickMenuBar1::setContentItem(QQuickItem *item)
 {
     if (item != m_contentItem) {
         m_contentItem = item;
@@ -123,7 +123,7 @@ void QQuickMenuBar::setContentItem(QQuickItem *item)
     }
 }
 
-void QQuickMenuBar::setParentWindow(QQuickWindow *newParentWindow)
+void QQuickMenuBar1::setParentWindow(QQuickWindow *newParentWindow)
 {
     if (newParentWindow != m_parentWindow) {
         m_parentWindow = newParentWindow;
@@ -132,9 +132,9 @@ void QQuickMenuBar::setParentWindow(QQuickWindow *newParentWindow)
     }
 }
 
-void QQuickMenuBar::append_menu(QQmlListProperty<QQuickMenu> *list, QQuickMenu *menu)
+void QQuickMenuBar1::append_menu(QQmlListProperty<QQuickMenu1> *list, QQuickMenu1 *menu)
 {
-    if (QQuickMenuBar *menuBar = qobject_cast<QQuickMenuBar *>(list->object)) {
+    if (QQuickMenuBar1 *menuBar = qobject_cast<QQuickMenuBar1 *>(list->object)) {
         menu->setParent(menuBar);
         menuBar->m_menus.append(menu);
 
@@ -145,16 +145,16 @@ void QQuickMenuBar::append_menu(QQmlListProperty<QQuickMenu> *list, QQuickMenu *
     }
 }
 
-int QQuickMenuBar::count_menu(QQmlListProperty<QQuickMenu> *list)
+int QQuickMenuBar1::count_menu(QQmlListProperty<QQuickMenu1> *list)
 {
-    if (QQuickMenuBar *menuBar = qobject_cast<QQuickMenuBar *>(list->object))
+    if (QQuickMenuBar1 *menuBar = qobject_cast<QQuickMenuBar1 *>(list->object))
         return menuBar->m_menus.size();
     return 0;
 }
 
-QQuickMenu *QQuickMenuBar::at_menu(QQmlListProperty<QQuickMenu> *list, int index)
+QQuickMenu1 *QQuickMenuBar1::at_menu(QQmlListProperty<QQuickMenu1> *list, int index)
 {
-    QQuickMenuBar *menuBar = qobject_cast<QQuickMenuBar *>(list->object);
+    QQuickMenuBar1 *menuBar = qobject_cast<QQuickMenuBar1 *>(list->object);
     if (menuBar &&  0 <= index && index < menuBar->m_menus.size())
         return menuBar->m_menus[index];
     return 0;
diff --git a/src/controls/qquickmenubar_p.h b/src/controls/qquickmenubar_p.h
index 83166d77..47b27a42 100644
--- a/src/controls/qquickmenubar_p.h
+++ b/src/controls/qquickmenubar_p.h
@@ -47,11 +47,11 @@ QT_BEGIN_NAMESPACE
 class QPlatformMenuBar;
 class QQuickItem;
 
-class QQuickMenuBar: public QObject
+class QQuickMenuBar1: public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QQmlListProperty<QQuickMenu> menus READ menus NOTIFY menusChanged)
+    Q_PROPERTY(QQmlListProperty<QQuickMenu1> menus READ menus NOTIFY menusChanged)
     Q_CLASSINFO("DefaultProperty", "menus")
 
     Q_PROPERTY(QQuickItem *__contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged)
@@ -64,10 +64,10 @@ Q_SIGNALS:
     void contentItemChanged();
 
 public:
-    QQuickMenuBar(QObject *parent = 0);
-    ~QQuickMenuBar();
+    QQuickMenuBar1(QObject *parent = 0);
+    ~QQuickMenuBar1();
 
-    QQmlListProperty<QQuickMenu> menus();
+    QQmlListProperty<QQuickMenu1> menus();
 
     bool isNative() const;
     void setNative(bool native);
@@ -82,12 +82,12 @@ public:
 
 private:
     void setNativeNoNotify(bool native);
-    static void append_menu(QQmlListProperty<QQuickMenu> *list, QQuickMenu *menu);
-    static int count_menu(QQmlListProperty<QQuickMenu> *list);
-    static QQuickMenu *at_menu(QQmlListProperty<QQuickMenu> *list, int index);
+    static void append_menu(QQmlListProperty<QQuickMenu1> *list, QQuickMenu1 *menu);
+    static int count_menu(QQmlListProperty<QQuickMenu1> *list);
+    static QQuickMenu1 *at_menu(QQmlListProperty<QQuickMenu1> *list, int index);
 
 private:
-    QList<QQuickMenu *> m_menus;
+    QList<QQuickMenu1 *> m_menus;
     QPlatformMenuBar *m_platformMenuBar;
     QQuickItem *m_contentItem;
     QQuickWindow *m_parentWindow;
diff --git a/src/controls/qquickmenuitem.cpp b/src/controls/qquickmenuitem.cpp
index d2236bf5..2057ba11 100644
--- a/src/controls/qquickmenuitem.cpp
+++ b/src/controls/qquickmenuitem.cpp
@@ -89,12 +89,12 @@ QObject *QQuickMenuBase::parentMenuOrMenuBar() const
     return m_parentMenu;
 }
 
-QQuickMenu *QQuickMenuBase::parentMenu() const
+QQuickMenu1 *QQuickMenuBase::parentMenu() const
 {
     return m_parentMenu;
 }
 
-void QQuickMenuBase::setParentMenu(QQuickMenu *parentMenu)
+void QQuickMenuBase::setParentMenu(QQuickMenu1 *parentMenu)
 {
     if (m_platformItem && m_parentMenu && m_parentMenu->platformMenu())
         m_parentMenu->platformMenu()->removeMenuItem(m_platformItem);
@@ -114,7 +114,7 @@ void QQuickMenuBase::setContainer(QQuickMenuItemContainer *c)
 
 void QQuickMenuBase::syncWithPlatformMenu()
 {
-    QQuickMenu *menu = parentMenu();
+    QQuickMenu1 *menu = parentMenu();
     if (menu && menu->platformMenu() && platformItem()
         && menu->contains(this)) // If not, it'll be added later and then sync'ed
         menu->platformMenu()->syncMenuItem(platformItem());
@@ -283,7 +283,7 @@ void QQuickMenuText::updateIcon()
 
 /*!
     \qmltype MenuItem
-    \instantiates QQuickMenuItem
+    \instantiates QQuickMenuItem1
     \ingroup menus
     \ingroup controls
     \inqmlmodule QtQuick.Controls
@@ -456,7 +456,7 @@ void QQuickMenuText::updateIcon()
     Defaults to \c null, meaning no action is bound to the menu item.
 */
 
-QQuickMenuItem::QQuickMenuItem(QObject *parent)
+QQuickMenuItem1::QQuickMenuItem1(QObject *parent)
     : QQuickMenuText(parent, QQuickMenuItemType::Item), m_boundAction(0)
 {
     connect(this, SIGNAL(__textChanged()), this, SIGNAL(textChanged()));
@@ -469,21 +469,21 @@ QQuickMenuItem::QQuickMenuItem(QObject *parent)
         connect(platformItem(), SIGNAL(activated()), this, SLOT(trigger()), Qt::QueuedConnection);
 }
 
-QQuickMenuItem::~QQuickMenuItem()
+QQuickMenuItem1::~QQuickMenuItem1()
 {
     unbindFromAction(m_boundAction);
     if (platformItem())
         disconnect(platformItem(), SIGNAL(activated()), this, SLOT(trigger()));
 }
 
-void QQuickMenuItem::setParentMenu(QQuickMenu *parentMenu)
+void QQuickMenuItem1::setParentMenu(QQuickMenu1 *parentMenu)
 {
     QQuickMenuText::setParentMenu(parentMenu);
     if (parentMenu)
         connect(this, SIGNAL(triggered()), parentMenu, SLOT(updateSelectedIndex()));
 }
 
-void QQuickMenuItem::bindToAction(QQuickAction *action)
+void QQuickMenuItem1::bindToAction(QQuickAction *action)
 {
     m_boundAction = action;
 
@@ -511,7 +511,7 @@ void QQuickMenuItem::bindToAction(QQuickAction *action)
     }
 }
 
-void QQuickMenuItem::unbindFromAction(QObject *o)
+void QQuickMenuItem1::unbindFromAction(QObject *o)
 {
     if (!o)
         return;
@@ -538,14 +538,14 @@ void QQuickMenuItem::unbindFromAction(QObject *o)
     disconnect(action, SIGNAL(iconSourceChanged()), this, SIGNAL(iconSourceChanged()));
 }
 
-QQuickAction *QQuickMenuItem::action() const
+QQuickAction *QQuickMenuItem1::action() const
 {
     if (m_boundAction)
         return m_boundAction;
     return QQuickMenuText::action();
 }
 
-void QQuickMenuItem::setBoundAction(QQuickAction *a)
+void QQuickMenuItem1::setBoundAction(QQuickAction *a)
 {
     if (a == m_boundAction)
         return;
@@ -556,7 +556,7 @@ void QQuickMenuItem::setBoundAction(QQuickAction *a)
     emit actionChanged();
 }
 
-QString QQuickMenuItem::text() const
+QString QQuickMenuItem1::text() const
 {
     QString ownText = QQuickMenuText::text();
     if (!ownText.isNull())
@@ -564,7 +564,7 @@ QString QQuickMenuItem::text() const
     return m_boundAction ? m_boundAction->text() : QString();
 }
 
-QUrl QQuickMenuItem::iconSource() const
+QUrl QQuickMenuItem1::iconSource() const
 {
     QUrl ownIconSource = QQuickMenuText::iconSource();
     if (!ownIconSource.isEmpty())
@@ -572,7 +572,7 @@ QUrl QQuickMenuItem::iconSource() const
     return m_boundAction ? m_boundAction->iconSource() : QUrl();
 }
 
-QString QQuickMenuItem::iconName() const
+QString QQuickMenuItem1::iconName() const
 {
     QString ownIconName = QQuickMenuText::iconName();
     if (!ownIconName.isEmpty())
@@ -580,7 +580,7 @@ QString QQuickMenuItem::iconName() const
     return m_boundAction ? m_boundAction->iconName() : QString();
 }
 
-QIcon QQuickMenuItem::icon() const
+QIcon QQuickMenuItem1::icon() const
 {
     QIcon ownIcon = QQuickMenuText::icon();
     if (!ownIcon.isNull())
@@ -588,18 +588,18 @@ QIcon QQuickMenuItem::icon() const
     return m_boundAction ? m_boundAction->icon() : QIcon();
 }
 
-QVariant QQuickMenuItem::shortcut() const
+QVariant QQuickMenuItem1::shortcut() const
 {
     return action()->shortcut();
 }
 
-void QQuickMenuItem::setShortcut(const QVariant &shortcut)
+void QQuickMenuItem1::setShortcut(const QVariant &shortcut)
 {
     if (!m_boundAction)
         action()->setShortcut(shortcut);
 }
 
-void QQuickMenuItem::updateShortcut()
+void QQuickMenuItem1::updateShortcut()
 {
     if (platformItem()) {
         QKeySequence sequence;
@@ -614,18 +614,18 @@ void QQuickMenuItem::updateShortcut()
     emit shortcutChanged();
 }
 
-bool QQuickMenuItem::checkable() const
+bool QQuickMenuItem1::checkable() const
 {
     return action()->isCheckable();
 }
 
-void QQuickMenuItem::setCheckable(bool checkable)
+void QQuickMenuItem1::setCheckable(bool checkable)
 {
     if (!m_boundAction)
         action()->setCheckable(checkable);
 }
 
-void QQuickMenuItem::updateCheckable()
+void QQuickMenuItem1::updateCheckable()
 {
     if (platformItem()) {
         platformItem()->setCheckable(checkable());
@@ -635,18 +635,18 @@ void QQuickMenuItem::updateCheckable()
     emit checkableChanged();
 }
 
-bool QQuickMenuItem::checked() const
+bool QQuickMenuItem1::checked() const
 {
     return action()->isChecked();
 }
 
-void QQuickMenuItem::setChecked(bool checked)
+void QQuickMenuItem1::setChecked(bool checked)
 {
     if (!m_boundAction)
         action()->setChecked(checked);
 }
 
-void QQuickMenuItem::updateChecked()
+void QQuickMenuItem1::updateChecked()
 {
     bool checked = this->checked();
     if (platformItem()) {
@@ -657,26 +657,26 @@ void QQuickMenuItem::updateChecked()
     emit toggled(checked);
 }
 
-QQuickExclusiveGroup1 *QQuickMenuItem::exclusiveGroup() const
+QQuickExclusiveGroup1 *QQuickMenuItem1::exclusiveGroup() const
 {
     return action()->exclusiveGroup();
 }
 
-void QQuickMenuItem::setExclusiveGroup(QQuickExclusiveGroup1 *eg)
+void QQuickMenuItem1::setExclusiveGroup(QQuickExclusiveGroup1 *eg)
 {
     if (!m_boundAction)
         action()->setExclusiveGroup(eg);
 }
 
-void QQuickMenuItem::setEnabled(bool enabled)
+void QQuickMenuItem1::setEnabled(bool enabled)
 {
     if (!m_boundAction)
         action()->setEnabled(enabled);
 }
 
-void QQuickMenuItem::trigger()
+void QQuickMenuItem1::trigger()
 {
-    QPointer<QQuickMenu> menu(parentMenu());
+    QPointer<QQuickMenu1> menu(parentMenu());
     if (menu)
         menu->prepareItemTrigger(this);
     action()->trigger(this);
diff --git a/src/controls/qquickmenuitem_p.h b/src/controls/qquickmenuitem_p.h
index d8f3ca32..4c60a9b8 100644
--- a/src/controls/qquickmenuitem_p.h
+++ b/src/controls/qquickmenuitem_p.h
@@ -51,7 +51,7 @@ class QPlatformMenuItem;
 class QQuickItem;
 class QQuickAction;
 class QQuickExclusiveGroup1;
-class QQuickMenu;
+class QQuickMenu1;
 class QQuickMenuItemContainer;
 
 class QQuickMenuItemType
@@ -88,9 +88,9 @@ public:
     bool visible() const { return m_visible; }
     virtual void setVisible(bool);
 
-    QQuickMenu *parentMenu() const;
+    QQuickMenu1 *parentMenu() const;
     QObject *parentMenuOrMenuBar() const;
-    virtual void setParentMenu(QQuickMenu *parentMenu);
+    virtual void setParentMenu(QQuickMenu1 *parentMenu);
 
     QQuickMenuItemContainer *container() const;
     void setContainer(QQuickMenuItemContainer *);
@@ -107,7 +107,7 @@ public:
 private:
     bool m_visible;
     QQuickMenuItemType::MenuItemType m_type;
-    QQuickMenu *m_parentMenu;
+    QQuickMenu1 *m_parentMenu;
     QQuickMenuItemContainer *m_container;
     QPlatformMenuItem *m_platformItem;
     QPointer<QQuickItem> m_visualItem;
@@ -167,7 +167,7 @@ private:
     QQuickAction *m_action;
 };
 
-class QQuickMenuItem : public QQuickMenuText
+class QQuickMenuItem1 : public QQuickMenuText
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
@@ -191,8 +191,8 @@ Q_SIGNALS:
     void actionChanged();
 
 public:
-    QQuickMenuItem(QObject *parent = 0);
-    ~QQuickMenuItem();
+    QQuickMenuItem1(QObject *parent = 0);
+    ~QQuickMenuItem1();
 
     void setEnabled(bool enabled);
 
@@ -216,7 +216,7 @@ public:
     QQuickExclusiveGroup1 *exclusiveGroup() const;
     void setExclusiveGroup(QQuickExclusiveGroup1 *);
 
-    void setParentMenu(QQuickMenu *parentMenu);
+    void setParentMenu(QQuickMenu1 *parentMenu);
 
 protected Q_SLOTS:
     void updateShortcut();
diff --git a/src/controls/qquickmenuitemcontainer_p.h b/src/controls/qquickmenuitemcontainer_p.h
index a69d219d..fe58bf92 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);
         Q_FOREACH (QQuickMenuBase *item, m_menuItems)
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) {
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
diff --git a/tests/auto/controls/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml
index 83411bcf..94661ed4 100644
--- a/tests/auto/controls/data/tst_menu.qml
+++ b/tests/auto/controls/data/tst_menu.qml
@@ -236,7 +236,7 @@ TestCase {
     function test_popupSignals() {
         if (Qt.platform.os === "osx") {
             // On Mac the popup() function blocks. The signals are still
-            // emitted by the QPA plugin and the relayed by QQuickMenu.
+            // emitted by the QPA plugin and the relayed by QQuickMenu1.
             return;
         }
         menu.__popup(Qt.rect(50, 50, 20, 20))