Introduce MenuBar

MenuBar is an ordinary Item. It can be located basically anywhere, but
the idea is to introduce a new ApplicationWindow::menuBar property in a
follow-up commit. Currently the example snippets are using the header
property.

[ChangeLog][Controls][MenuBar] Introduced a MenuBar control.

Task-number: QTBUG-60350
Change-Id: Ie66dc457a3d8edbe8362fab2a591dc49442c95e2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

4 files changed, 736 insertions, 0 deletions

diff --git a/tests/auto/qquickmenubar/data/empty.qml b/tests/auto/qquickmenubar/data/empty.qml
new file mode 100644
index 00000000..2ed46af0
--- /dev/null
+++ b/tests/auto/qquickmenubar/data/empty.qml
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.9
+import QtQuick.Controls 2.3
+
+MenuBar { }
diff --git a/tests/auto/qquickmenubar/data/menubar.qml b/tests/auto/qquickmenubar/data/menubar.qml
new file mode 100644
index 00000000..d0d6300a
--- /dev/null
+++ b/tests/auto/qquickmenubar/data/menubar.qml
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.9
+import QtQuick.Controls 2.3
+
+ApplicationWindow {
+    width: 400
+    height: 400
+    visible: true
+
+    header: MenuBar {
+        MenuBarItem {
+            menu: Menu {
+                title: "&File"
+                MenuItem { text: "&Open..." }
+                MenuItem { text: "&Save" }
+                MenuItem { text: "Save &As..." }
+                MenuSeparator { }
+                MenuItem { text: "&Quit" }
+            }
+        }
+        MenuBarItem {
+            menu: Menu {
+                title: "&Edit"
+                MenuItem { text: "&Cut" }
+                MenuItem { text: "&Copy" }
+                MenuItem { text: "&Paste" }
+            }
+        }
+        MenuBarItem {
+            menu: Menu {
+                title: "&View"
+                Menu {
+                    title: "&Alignment"
+                    Menu {
+                        title: "&Horizontal"
+                        MenuItem { text: "&Left" }
+                        MenuItem { text: "&Center" }
+                        MenuItem { text: "&Right" }
+                    }
+                    Menu {
+                        title: "&Vertical"
+                        MenuItem { text: "&Top" }
+                        MenuItem { text: "&Center" }
+                        MenuItem { text: "&Bottom" }
+                    }
+                }
+            }
+        }
+
+        MenuBarItem {
+            menu: Menu {
+                title: "&Help"
+                MenuItem { text: "&About" }
+            }
+        }
+    }
+}
diff --git a/tests/auto/qquickmenubar/qquickmenubar.pro b/tests/auto/qquickmenubar/qquickmenubar.pro
new file mode 100644
index 00000000..b7d41f0f
--- /dev/null
+++ b/tests/auto/qquickmenubar/qquickmenubar.pro
@@ -0,0 +1,14 @@
+CONFIG += testcase
+TARGET = tst_qquickmenubar
+SOURCES += tst_qquickmenubar.cpp
+
+macos:CONFIG -= app_bundle
+
+QT += core-private gui-private qml-private quick-private testlib quicktemplates2-private
+
+include (../shared/util.pri)
+
+TESTDATA = data/*
+
+OTHER_FILES += \
+    data/*.qml
diff --git a/tests/auto/qquickmenubar/tst_qquickmenubar.cpp b/tests/auto/qquickmenubar/tst_qquickmenubar.cpp
new file mode 100644
index 00000000..5e4d075e
--- /dev/null
+++ b/tests/auto/qquickmenubar/tst_qquickmenubar.cpp
@@ -0,0 +1,562 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest>
+#include <QtQml>
+#include "../shared/util.h"
+#include "../shared/visualtestutil.h"
+#include "../shared/qtest_quickcontrols.h"
+
+#include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
+#include <QtQuickTemplates2/private/qquickmenu_p.h>
+#include <QtQuickTemplates2/private/qquickmenubar_p.h>
+#include <QtQuickTemplates2/private/qquickmenubaritem_p.h>
+#include <QtQuickTemplates2/private/qquickmenuitem_p.h>
+
+using namespace QQuickVisualTestUtil;
+
+class tst_qquickmenubar : public QQmlDataTest
+{
+    Q_OBJECT
+
+public:
+
+private slots:
+    void delegate();
+    void mouse();
+    void keys();
+    void mnemonics();
+    void addRemove();
+};
+
+void tst_qquickmenubar::delegate()
+{
+    QQmlApplicationEngine engine(testFileUrl("empty.qml"));
+    QScopedPointer<QQuickMenuBar> menuBar(qobject_cast<QQuickMenuBar *>(engine.rootObjects().value(0)));
+    QVERIFY(menuBar);
+
+    QQmlComponent *delegate = menuBar->delegate();
+    QVERIFY(delegate);
+
+    QScopedPointer<QQuickMenuBarItem> item(qobject_cast<QQuickMenuBarItem *>(delegate->create()));
+    QVERIFY(item);
+}
+
+void tst_qquickmenubar::mouse()
+{
+    QQmlApplicationEngine engine(testFileUrl("menubar.qml"));
+
+    QScopedPointer<QQuickApplicationWindow> window(qobject_cast<QQuickApplicationWindow *>(engine.rootObjects().value(0)));
+    QVERIFY(window);
+    QVERIFY(QTest::qWaitForWindowActive(window.data()));
+
+    moveMouseAway(window.data());
+
+    QQuickMenuBar *menuBar = window->property("header").value<QQuickMenuBar *>();
+    QVERIFY(menuBar);
+
+    QQuickMenu *fileMenuBarMenu = menuBar->menuAt(0);
+    QQuickMenu *editMenuBarMenu = menuBar->menuAt(1);
+    QQuickMenu *viewMenuBarMenu = menuBar->menuAt(2);
+    QQuickMenu *helpMenuBarMenu = menuBar->menuAt(3);
+    QVERIFY(fileMenuBarMenu && editMenuBarMenu && viewMenuBarMenu && helpMenuBarMenu);
+
+    QQuickMenuBarItem *fileMenuBarItem = qobject_cast<QQuickMenuBarItem *>(fileMenuBarMenu->parentItem());
+    QQuickMenuBarItem *editMenuBarItem = qobject_cast<QQuickMenuBarItem *>(editMenuBarMenu->parentItem());
+    QQuickMenuBarItem *viewMenuBarItem = qobject_cast<QQuickMenuBarItem *>(viewMenuBarMenu->parentItem());
+    QQuickMenuBarItem *helpMenuBarItem = qobject_cast<QQuickMenuBarItem *>(helpMenuBarMenu->parentItem());
+    QVERIFY(fileMenuBarItem && editMenuBarItem && viewMenuBarItem && helpMenuBarItem);
+
+    // highlight a menubar item
+    QTest::mouseMove(window.data(), fileMenuBarItem->mapToScene(QPointF(fileMenuBarItem->width() / 2, fileMenuBarItem->height() / 2)).toPoint());
+    QVERIFY(fileMenuBarItem->isHighlighted());
+    QVERIFY(!fileMenuBarMenu->isVisible());
+
+    // highlight another menubar item
+    QTest::mouseMove(window.data(), editMenuBarItem->mapToScene(QPointF(editMenuBarItem->width() / 2, editMenuBarItem->height() / 2)).toPoint());
+    QVERIFY(!fileMenuBarItem->isHighlighted());
+    QVERIFY(editMenuBarItem->isHighlighted());
+    QVERIFY(!fileMenuBarMenu->isVisible());
+    QVERIFY(!editMenuBarMenu->isVisible());
+
+    // trigger a menubar item to open a menu
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, editMenuBarItem->mapToScene(QPointF(editMenuBarItem->width() / 2, editMenuBarItem->height() / 2)).toPoint());
+    QVERIFY(editMenuBarItem->isHighlighted());
+    QVERIFY(editMenuBarMenu->isVisible());
+    QTRY_VERIFY(editMenuBarMenu->isOpened());
+
+    // re-trigger a menubar item to hide the menu
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, editMenuBarItem->mapToScene(QPointF(editMenuBarItem->width() / 2, editMenuBarItem->height() / 2)).toPoint());
+    QVERIFY(editMenuBarItem->isHighlighted());
+    QVERIFY(editMenuBarItem->hasActiveFocus());
+    QTRY_VERIFY(!editMenuBarMenu->isVisible());
+
+    // re-trigger a menubar item to show the menu again
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, editMenuBarItem->mapToScene(QPointF(editMenuBarItem->width() / 2, editMenuBarItem->height() / 2)).toPoint());
+    QVERIFY(editMenuBarItem->isHighlighted());
+    QVERIFY(editMenuBarMenu->isVisible());
+    QTRY_VERIFY(editMenuBarMenu->isOpened());
+
+    // highlight another menubar item to open another menu
+    QTest::mouseMove(window.data(), helpMenuBarItem->mapToScene(QPointF(helpMenuBarItem->width() / 2, helpMenuBarItem->height() / 2)).toPoint());
+    QVERIFY(!fileMenuBarItem->isHighlighted());
+    QVERIFY(!editMenuBarItem->isHighlighted());
+    QVERIFY(!viewMenuBarItem->isHighlighted());
+    QVERIFY(helpMenuBarItem->isHighlighted());
+    QVERIFY(!fileMenuBarMenu->isVisible());
+    QVERIFY(!viewMenuBarMenu->isVisible());
+    QVERIFY(helpMenuBarMenu->isVisible());
+    QTRY_VERIFY(!editMenuBarMenu->isVisible());
+    QTRY_VERIFY(helpMenuBarMenu->isOpened());
+
+    // trigger a menu item to close the menu
+    QQuickMenuItem *aboutMenuItem = qobject_cast<QQuickMenuItem *>(helpMenuBarMenu->itemAt(0));
+    QVERIFY(aboutMenuItem);
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, aboutMenuItem->mapToScene(QPointF(aboutMenuItem->width() / 2, aboutMenuItem->height() / 2)).toPoint());
+    QVERIFY(!helpMenuBarItem->isHighlighted());
+    QTRY_VERIFY(!helpMenuBarMenu->isVisible());
+
+    // highlight a menubar item
+    QTest::mouseMove(window.data(), editMenuBarItem->mapToScene(QPointF(editMenuBarItem->width() / 2, editMenuBarItem->height() / 2)).toPoint());
+    QVERIFY(editMenuBarItem->isHighlighted());
+    QVERIFY(!helpMenuBarItem->isHighlighted());
+    QVERIFY(!editMenuBarMenu->isVisible());
+    QVERIFY(!helpMenuBarMenu->isVisible());
+
+    // trigger a menubar item to open a menu
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, viewMenuBarItem->mapToScene(QPointF(viewMenuBarItem->width() / 2, viewMenuBarItem->height() / 2)).toPoint());
+    QVERIFY(!editMenuBarItem->isHighlighted());
+    QVERIFY(viewMenuBarItem->isHighlighted());
+    QVERIFY(viewMenuBarMenu->isVisible());
+    QTRY_VERIFY(viewMenuBarMenu->isOpened());
+
+    // trigger a menu item to open a sub-menu
+    QQuickMenuItem *alignmentSubMenuItem = qobject_cast<QQuickMenuItem *>(viewMenuBarMenu->itemAt(0));
+    QVERIFY(alignmentSubMenuItem);
+    QQuickMenu *alignmentSubMenu = alignmentSubMenuItem->subMenu();
+    QVERIFY(alignmentSubMenu);
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, alignmentSubMenuItem->mapToScene(QPointF(alignmentSubMenuItem->width() / 2, alignmentSubMenuItem->height() / 2)).toPoint());
+    QVERIFY(viewMenuBarMenu->isVisible());
+    QVERIFY(alignmentSubMenu->isVisible());
+    QTRY_VERIFY(alignmentSubMenu->isOpened());
+
+    // trigger a menu item to open a sub-sub-menu
+    QQuickMenuItem *verticalSubMenuItem = qobject_cast<QQuickMenuItem *>(alignmentSubMenu->itemAt(1));
+    QVERIFY(verticalSubMenuItem);
+    QQuickMenu *verticalSubMenu = verticalSubMenuItem->subMenu();
+    QVERIFY(verticalSubMenu);
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, verticalSubMenuItem->mapToScene(QPointF(verticalSubMenuItem->width() / 2, verticalSubMenuItem->height() / 2)).toPoint());
+    QVERIFY(viewMenuBarMenu->isVisible());
+    QVERIFY(alignmentSubMenu->isVisible());
+    QVERIFY(verticalSubMenu->isVisible());
+    QTRY_VERIFY(verticalSubMenu->isOpened());
+
+    // trigger a menu item to close the whole chain of menus
+    QQuickMenuItem *centerMenuItem = qobject_cast<QQuickMenuItem *>(verticalSubMenu->itemAt(1));
+    QVERIFY(centerMenuItem);
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, centerMenuItem->mapToScene(QPointF(centerMenuItem->width() / 2, centerMenuItem->height() / 2)).toPoint());
+    QVERIFY(!viewMenuBarItem->isHighlighted());
+    QTRY_VERIFY(!viewMenuBarMenu->isVisible());
+    QTRY_VERIFY(!alignmentSubMenu->isVisible());
+    QTRY_VERIFY(!verticalSubMenu->isVisible());
+
+    // re-highlight the same menubar item
+    QTest::mouseMove(window.data(), viewMenuBarItem->mapToScene(QPointF(viewMenuBarItem->width() / 2, viewMenuBarItem->height() / 2)).toPoint());
+    QVERIFY(viewMenuBarItem->isHighlighted());
+
+    // re-open the chain of menus
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, viewMenuBarItem->mapToScene(QPointF(viewMenuBarItem->width() / 2, viewMenuBarItem->height() / 2)).toPoint());
+    QTRY_VERIFY(viewMenuBarMenu->isOpened());
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, alignmentSubMenuItem->mapToScene(QPointF(alignmentSubMenuItem->width() / 2, alignmentSubMenuItem->height() / 2)).toPoint());
+    QTRY_VERIFY(alignmentSubMenu->isOpened());
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, verticalSubMenuItem->mapToScene(QPointF(verticalSubMenuItem->width() / 2, verticalSubMenuItem->height() / 2)).toPoint());
+    QTRY_VERIFY(verticalSubMenu->isOpened());
+
+    // click outside to close the whole chain of menus
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(window->width() - 1, window->height() - 1));
+    QVERIFY(!viewMenuBarItem->isHighlighted());
+    QTRY_VERIFY(!viewMenuBarMenu->isVisible());
+    QTRY_VERIFY(!alignmentSubMenu->isVisible());
+    QTRY_VERIFY(!verticalSubMenu->isVisible());
+}
+
+void tst_qquickmenubar::keys()
+{
+    QQmlApplicationEngine engine(testFileUrl("menubar.qml"));
+
+    QScopedPointer<QQuickApplicationWindow> window(qobject_cast<QQuickApplicationWindow *>(engine.rootObjects().value(0)));
+    QVERIFY(window);
+    QVERIFY(QTest::qWaitForWindowActive(window.data()));
+
+    moveMouseAway(window.data());
+
+    QQuickMenuBar *menuBar = window->property("header").value<QQuickMenuBar *>();
+    QVERIFY(menuBar);
+
+    QQuickMenu *fileMenuBarMenu = menuBar->menuAt(0);
+    QQuickMenu *editMenuBarMenu = menuBar->menuAt(1);
+    QQuickMenu *viewMenuBarMenu = menuBar->menuAt(2);
+    QQuickMenu *helpMenuBarMenu = menuBar->menuAt(3);
+    QVERIFY(fileMenuBarMenu && editMenuBarMenu && viewMenuBarMenu && helpMenuBarMenu);
+
+    QQuickMenuBarItem *fileMenuBarItem = qobject_cast<QQuickMenuBarItem *>(fileMenuBarMenu->parentItem());
+    QQuickMenuBarItem *editMenuBarItem = qobject_cast<QQuickMenuBarItem *>(editMenuBarMenu->parentItem());
+    QQuickMenuBarItem *viewMenuBarItem = qobject_cast<QQuickMenuBarItem *>(viewMenuBarMenu->parentItem());
+    QQuickMenuBarItem *helpMenuBarItem = qobject_cast<QQuickMenuBarItem *>(helpMenuBarMenu->parentItem());
+    QVERIFY(fileMenuBarItem && editMenuBarItem && viewMenuBarItem && helpMenuBarItem);
+
+    // trigger a menubar item to open a menu
+    editMenuBarItem->forceActiveFocus();
+    QTest::keyClick(window.data(), Qt::Key_Space);
+    QVERIFY(editMenuBarItem->isHighlighted());
+    QVERIFY(editMenuBarMenu->isVisible());
+    QTRY_VERIFY(editMenuBarMenu->isOpened());
+    QVERIFY(editMenuBarMenu->hasActiveFocus());
+
+    // navigate down to the menu
+    QQuickMenuItem *cutMenuItem = qobject_cast<QQuickMenuItem *>(editMenuBarMenu->itemAt(0));
+    QVERIFY(cutMenuItem);
+    QVERIFY(!cutMenuItem->isHighlighted());
+    QVERIFY(!cutMenuItem->hasActiveFocus());
+    QTest::keyClick(window.data(), Qt::Key_Down);
+    QVERIFY(cutMenuItem->isHighlighted());
+    QVERIFY(cutMenuItem->hasActiveFocus());
+
+    // navigate up, back to the menubar
+    QTest::keyClick(window.data(), Qt::Key_Up);
+    QVERIFY(editMenuBarItem->isHighlighted());
+    QVERIFY(editMenuBarItem->hasActiveFocus());
+    QTRY_VERIFY(!editMenuBarMenu->isVisible());
+    QVERIFY(!cutMenuItem->isHighlighted());
+    QVERIFY(!cutMenuItem->hasActiveFocus());
+
+    // navigate down to re-open the menu
+    QTest::keyClick(window.data(), Qt::Key_Down);
+    QVERIFY(editMenuBarItem->isHighlighted());
+    QVERIFY(!editMenuBarItem->hasActiveFocus());
+    QVERIFY(editMenuBarMenu->isVisible());
+    QTRY_VERIFY(editMenuBarMenu->isOpened());
+    QVERIFY(editMenuBarMenu->hasActiveFocus());
+    QVERIFY(cutMenuItem->isHighlighted());
+    QVERIFY(cutMenuItem->hasActiveFocus());
+
+    // navigate left in popup mode (menu open)
+    QTest::keyClick(window.data(), Qt::Key_Left);
+    QVERIFY(fileMenuBarItem->isHighlighted());
+    QVERIFY(!editMenuBarItem->isHighlighted());
+    QVERIFY(fileMenuBarMenu->isVisible());
+    QTRY_VERIFY(fileMenuBarMenu->isOpened());
+    QTRY_VERIFY(!editMenuBarMenu->isVisible());
+
+    // navigate left in popup mode (wrap)
+    QTest::keyClick(window.data(), Qt::Key_Left);
+    QVERIFY(helpMenuBarItem->isHighlighted());
+    QVERIFY(!fileMenuBarItem->isHighlighted());
+    QVERIFY(helpMenuBarMenu->isVisible());
+    QTRY_VERIFY(helpMenuBarMenu->isOpened());
+    QTRY_VERIFY(!fileMenuBarMenu->isVisible());
+
+    // navigate up to close the menu
+    QTest::keyClick(window.data(), Qt::Key_Up);
+    QVERIFY(helpMenuBarItem->isHighlighted());
+    QTRY_VERIFY(!helpMenuBarMenu->isVisible());
+
+    // navigate right in non-popup mode (wrap)
+    QTest::keyClick(window.data(), Qt::Key_Right);
+    QVERIFY(fileMenuBarItem->isHighlighted());
+    QVERIFY(!helpMenuBarItem->isHighlighted());
+    QVERIFY(!fileMenuBarMenu->isVisible());
+    QVERIFY(!helpMenuBarMenu->isVisible());
+
+    // navigate right in non-popup mode (menu closed)
+    QTest::keyClick(window.data(), Qt::Key_Right);
+    QVERIFY(!fileMenuBarItem->isHighlighted());
+    QVERIFY(editMenuBarItem->isHighlighted());
+    QVERIFY(!fileMenuBarMenu->isVisible());
+    QVERIFY(!editMenuBarMenu->isVisible());
+
+    // open a menu
+    viewMenuBarItem->forceActiveFocus();
+    QTest::keyClick(window.data(), Qt::Key_Space);
+    QVERIFY(viewMenuBarItem->isHighlighted());
+    QVERIFY(viewMenuBarMenu->isVisible());
+    QTRY_VERIFY(viewMenuBarMenu->isOpened());
+    QVERIFY(!viewMenuBarItem->hasActiveFocus());
+    QVERIFY(viewMenuBarMenu->hasActiveFocus());
+
+    // open a sub-menu
+    QQuickMenuItem *alignmentSubMenuItem = qobject_cast<QQuickMenuItem *>(viewMenuBarMenu->itemAt(0));
+    QVERIFY(alignmentSubMenuItem);
+    QQuickMenu *alignmentSubMenu = alignmentSubMenuItem->subMenu();
+    QVERIFY(alignmentSubMenu);
+    QTest::keyClick(window.data(), Qt::Key_Down);
+    QVERIFY(alignmentSubMenuItem->isHighlighted());
+    QVERIFY(!alignmentSubMenu->isVisible());
+    QTest::keyClick(window.data(), Qt::Key_Right);
+    QVERIFY(alignmentSubMenu->isVisible());
+    QTRY_VERIFY(alignmentSubMenu->isOpened());
+
+    // open a sub-sub-menu
+    QQuickMenuItem *horizontalSubMenuItem = qobject_cast<QQuickMenuItem *>(alignmentSubMenu->itemAt(0));
+    QVERIFY(horizontalSubMenuItem);
+    QVERIFY(horizontalSubMenuItem->isHighlighted());
+    QQuickMenu *horizontalSubMenu = horizontalSubMenuItem->subMenu();
+    QVERIFY(horizontalSubMenu);
+    QTest::keyClick(window.data(), Qt::Key_Right);
+    QVERIFY(viewMenuBarMenu->isVisible());
+    QVERIFY(alignmentSubMenu->isVisible());
+    QVERIFY(horizontalSubMenu->isVisible());
+    QTRY_VERIFY(horizontalSubMenu->isOpened());
+
+    // navigate left to close a sub-menu
+    QTest::keyClick(window.data(), Qt::Key_Left);
+    QTRY_VERIFY(!horizontalSubMenu->isVisible());
+    QVERIFY(viewMenuBarMenu->isVisible());
+    QVERIFY(alignmentSubMenu->isVisible());
+
+    // navigate right to re-open the sub-menu
+    QTest::keyClick(window.data(), Qt::Key_Right);
+    QVERIFY(horizontalSubMenuItem->isHighlighted());
+    QVERIFY(horizontalSubMenu->isVisible());
+    QTRY_VERIFY(horizontalSubMenu->isOpened());
+
+    // navigate right to the next menubar menu
+    QTest::keyClick(window.data(), Qt::Key_Right);
+    QVERIFY(!viewMenuBarItem->isHighlighted());
+    QVERIFY(helpMenuBarItem->isHighlighted());
+    QVERIFY(helpMenuBarMenu->isVisible());
+    QTRY_VERIFY(!viewMenuBarMenu->isVisible());
+    QTRY_VERIFY(!alignmentSubMenu->isVisible());
+    QTRY_VERIFY(!horizontalSubMenu->isVisible());
+    QTRY_VERIFY(helpMenuBarMenu->isOpened());
+
+    // navigate back
+    QTest::keyClick(window.data(), Qt::Key_Left);
+    QVERIFY(!helpMenuBarItem->isHighlighted());
+    QVERIFY(viewMenuBarItem->isHighlighted());
+    QVERIFY(viewMenuBarMenu->isVisible());
+    QTRY_VERIFY(!helpMenuBarMenu->isVisible());
+    QTRY_VERIFY(viewMenuBarMenu->isOpened());
+
+    // re-open the chain of menus
+    QTest::keyClick(window.data(), Qt::Key_Down);
+    QVERIFY(alignmentSubMenuItem->isHighlighted());
+    QTest::keyClick(window.data(), Qt::Key_Right);
+    QTRY_VERIFY(alignmentSubMenu->isOpened());
+    QTest::keyClick(window.data(), Qt::Key_Right);
+    QTRY_VERIFY(horizontalSubMenu->isOpened());
+
+    // repeat escape to close the whole chain of menus one by one
+    QTest::keyClick(window.data(), Qt::Key_Escape);
+    QTRY_VERIFY(!horizontalSubMenu->isVisible());
+    QVERIFY(viewMenuBarItem->isHighlighted());
+    QVERIFY(viewMenuBarMenu->isVisible());
+    QVERIFY(alignmentSubMenu->isVisible());
+
+    QTest::keyClick(window.data(), Qt::Key_Escape);
+    QTRY_VERIFY(!alignmentSubMenu->isVisible());
+    QVERIFY(viewMenuBarItem->isHighlighted());
+    QVERIFY(viewMenuBarMenu->isVisible());
+
+    QTest::keyClick(window.data(), Qt::Key_Escape);
+    QVERIFY(!viewMenuBarItem->isHighlighted());
+    QTRY_VERIFY(!viewMenuBarMenu->isVisible());
+}
+
+void tst_qquickmenubar::mnemonics()
+{
+#ifdef Q_OS_MACOS
+    QSKIP("Mnemonics are not used on macOS");
+#endif
+
+    QQmlApplicationEngine engine(testFileUrl("menubar.qml"));
+
+    QScopedPointer<QQuickApplicationWindow> window(qobject_cast<QQuickApplicationWindow *>(engine.rootObjects().value(0)));
+    QVERIFY(window);
+    QVERIFY(QTest::qWaitForWindowActive(window.data()));
+
+    moveMouseAway(window.data());
+
+    QQuickMenuBar *menuBar = window->property("header").value<QQuickMenuBar *>();
+    QVERIFY(menuBar);
+
+    QQuickMenu *fileMenuBarMenu = menuBar->menuAt(0);
+    QQuickMenu *editMenuBarMenu = menuBar->menuAt(1);
+    QQuickMenu *viewMenuBarMenu = menuBar->menuAt(2);
+    QQuickMenu *helpMenuBarMenu = menuBar->menuAt(3);
+    QVERIFY(fileMenuBarMenu && editMenuBarMenu && viewMenuBarMenu && helpMenuBarMenu);
+
+    QQuickMenuBarItem *fileMenuBarItem = qobject_cast<QQuickMenuBarItem *>(fileMenuBarMenu->parentItem());
+    QQuickMenuBarItem *editMenuBarItem = qobject_cast<QQuickMenuBarItem *>(editMenuBarMenu->parentItem());
+    QQuickMenuBarItem *viewMenuBarItem = qobject_cast<QQuickMenuBarItem *>(viewMenuBarMenu->parentItem());
+    QQuickMenuBarItem *helpMenuBarItem = qobject_cast<QQuickMenuBarItem *>(helpMenuBarMenu->parentItem());
+    QVERIFY(fileMenuBarItem && editMenuBarItem && viewMenuBarItem && helpMenuBarItem);
+
+    // trigger a menubar item to open a menu
+    QTest::keyClick(window.data(), Qt::Key_E, Qt::AltModifier); // "&Edit"
+    QVERIFY(editMenuBarItem->isHighlighted());
+    QVERIFY(!editMenuBarItem->hasActiveFocus());
+    QVERIFY(editMenuBarMenu->isVisible());
+    QTRY_VERIFY(editMenuBarMenu->isOpened());
+    QVERIFY(editMenuBarMenu->hasActiveFocus());
+
+    // re-trigger a menubar item to hide the menu
+    QTest::keyClick(window.data(), Qt::Key_E, Qt::AltModifier); // "&Edit"
+    QVERIFY(editMenuBarItem->isHighlighted());
+    QVERIFY(editMenuBarItem->hasActiveFocus());
+    QVERIFY(!editMenuBarMenu->hasActiveFocus());
+    QTRY_VERIFY(!editMenuBarMenu->isVisible());
+
+    // re-trigger a menubar item to show the menu again
+    QTest::keyClick(window.data(), Qt::Key_E, Qt::AltModifier); // "&Edit"
+    QVERIFY(editMenuBarItem->isHighlighted());
+    QVERIFY(editMenuBarMenu->isVisible());
+    QTRY_VERIFY(editMenuBarMenu->isOpened());
+    QVERIFY(editMenuBarMenu->hasActiveFocus());
+    QVERIFY(!editMenuBarItem->hasActiveFocus());
+
+    // trigger another menubar item to open another menu
+    QTest::keyClick(window.data(), Qt::Key_H, Qt::AltModifier); // "&Help"
+    QVERIFY(!editMenuBarItem->isHighlighted());
+    QVERIFY(helpMenuBarItem->isHighlighted());
+    QVERIFY(!viewMenuBarMenu->isVisible());
+    QVERIFY(helpMenuBarMenu->isVisible());
+    QTRY_VERIFY(helpMenuBarMenu->isOpened());
+
+    // trigger a menu item to close the menu
+    QTest::keyClick(window.data(), Qt::Key_A, Qt::AltModifier); // "&About"
+    QVERIFY(!helpMenuBarItem->isHighlighted());
+    QTRY_VERIFY(!helpMenuBarMenu->isVisible());
+
+    // trigger a menubar item to open a menu
+    QTest::keyClick(window.data(), Qt::Key_V, Qt::AltModifier); // "&View"
+    QVERIFY(!editMenuBarItem->isHighlighted());
+    QVERIFY(viewMenuBarItem->isHighlighted());
+    QVERIFY(viewMenuBarMenu->isVisible());
+    QTRY_VERIFY(viewMenuBarMenu->isOpened());
+
+    // trigger a menu item to open a sub-menu
+    QQuickMenuItem *alignmentSubMenuItem = qobject_cast<QQuickMenuItem *>(viewMenuBarMenu->itemAt(0));
+    QVERIFY(alignmentSubMenuItem);
+    QQuickMenu *alignmentSubMenu = alignmentSubMenuItem->subMenu();
+    QVERIFY(alignmentSubMenu);
+    QTest::keyClick(window.data(), Qt::Key_A, Qt::AltModifier); // "&Alignment"
+    QVERIFY(viewMenuBarMenu->isVisible());
+    QVERIFY(alignmentSubMenu->isVisible());
+    QTRY_VERIFY(alignmentSubMenu->isOpened());
+
+    // trigger a menu item to open a sub-sub-menu
+    QQuickMenuItem *verticalSubMenuItem = qobject_cast<QQuickMenuItem *>(alignmentSubMenu->itemAt(1));
+    QVERIFY(verticalSubMenuItem);
+    QQuickMenu *verticalSubMenu = verticalSubMenuItem->subMenu();
+    QVERIFY(verticalSubMenu);
+    QTest::keyClick(window.data(), Qt::Key_V, Qt::AltModifier); // "&Vertical"
+    QVERIFY(viewMenuBarMenu->isVisible());
+    QVERIFY(alignmentSubMenu->isVisible());
+    QVERIFY(verticalSubMenu->isVisible());
+    QTRY_VERIFY(verticalSubMenu->isOpened());
+
+    // trigger a menu item to close the whole chain of menus
+    QTest::keyClick(window.data(), Qt::Key_C, Qt::AltModifier); // "&Center"
+    QVERIFY(!viewMenuBarItem->isHighlighted());
+    QTRY_VERIFY(!viewMenuBarMenu->isVisible());
+    QTRY_VERIFY(!alignmentSubMenu->isVisible());
+    QTRY_VERIFY(!verticalSubMenu->isVisible());
+}
+
+void tst_qquickmenubar::addRemove()
+{
+    QQmlApplicationEngine engine(testFileUrl("empty.qml"));
+
+    QScopedPointer<QQuickMenuBar> menuBar(qobject_cast<QQuickMenuBar *>(engine.rootObjects().value(0)));
+    QVERIFY(menuBar);
+
+    QQmlComponent component(&engine);
+    component.setData("import QtQuick.Controls 2.0; Menu { }", QUrl());
+
+    QPointer<QQuickMenu> menu1(qobject_cast<QQuickMenu *>(component.create()));
+    QVERIFY(!menu1.isNull());
+    menuBar->addMenu(menu1.data());
+    QCOMPARE(menuBar->count(), 1);
+    QCOMPARE(menuBar->menuAt(0), menu1.data());
+
+    QPointer<QQuickMenuBarItem> menuBarItem1(qobject_cast<QQuickMenuBarItem *>(menuBar->itemAt(0)));
+    QVERIFY(menuBarItem1);
+    QCOMPARE(menuBarItem1->menu(), menu1.data());
+    QCOMPARE(menuBar->itemAt(0), menuBarItem1.data());
+
+    QScopedPointer<QQuickMenu> menu2(qobject_cast<QQuickMenu *>(component.create()));
+    QVERIFY(!menu2.isNull());
+    menuBar->insertMenu(0, menu2.data());
+    QCOMPARE(menuBar->count(), 2);
+    QCOMPARE(menuBar->menuAt(0), menu2.data());
+    QCOMPARE(menuBar->menuAt(1), menu1.data());
+
+    QPointer<QQuickMenuBarItem> menuBarItem2(qobject_cast<QQuickMenuBarItem *>(menuBar->itemAt(0)));
+    QVERIFY(menuBarItem2);
+    QCOMPARE(menuBarItem2->menu(), menu2.data());
+    QCOMPARE(menuBar->itemAt(0), menuBarItem2.data());
+    QCOMPARE(menuBar->itemAt(1), menuBarItem1.data());
+
+    // takeMenu(int) does not destroy the menu, but does destroy the respective item in the menubar
+    QCOMPARE(menuBar->takeMenu(1), menu1.data());
+    QCOMPARE(menuBar->count(), 1);
+    QVERIFY(!menuBar->menuAt(1));
+    QVERIFY(!menuBar->itemAt(1));
+    QCoreApplication::sendPostedEvents(menu1.data(), QEvent::DeferredDelete);
+    QVERIFY(!menu1.isNull());
+    QCoreApplication::sendPostedEvents(menuBarItem1, QEvent::DeferredDelete);
+    QVERIFY(menuBarItem1.isNull());
+
+    // addMenu(Menu) re-creates the respective item in the menubar
+    menuBar->addMenu(menu1.data());
+    QCOMPARE(menuBar->count(), 2);
+    menuBarItem1 = qobject_cast<QQuickMenuBarItem *>(menuBar->itemAt(1));
+    QVERIFY(!menuBarItem1.isNull());
+
+    // removeMenu(Menu) destroys both the menu and the respective item in the menubar
+    menuBar->removeMenu(menu1.data());
+    QCOMPARE(menuBar->count(), 1);
+    QVERIFY(!menuBar->itemAt(1));
+    QCoreApplication::sendPostedEvents(menu1.data(), QEvent::DeferredDelete);
+    QVERIFY(menu1.isNull());
+    QCoreApplication::sendPostedEvents(menuBarItem1, QEvent::DeferredDelete);
+    QVERIFY(menuBarItem1.isNull());
+}
+
+QTEST_QUICKCONTROLS_MAIN(tst_qquickmenubar)
+
+#include "tst_qquickmenubar.moc"