Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	tests/auto/controls/data/tst_menubar.qml

Change-Id: I23c3299e6f6cef14093aa4f79b3e7d769c063064

1 files changed, 22 insertions, 2 deletions

diff --git a/tests/auto/controls/data/tst_menubar.qml b/tests/auto/controls/data/tst_menubar.qml
index e268b059..329b43e7 100644
--- a/tests/auto/controls/data/tst_menubar.qml
+++ b/tests/auto/controls/data/tst_menubar.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Controls 1.3
+import QtQuick.Controls 1.4
 import QtTest 1.0
 
 TestCase {
@@ -58,7 +58,7 @@ TestCase {
                 Menu {
                     title: "&File"; objectName: "fileMenu"
                     Menu {
-                        title: "&Recent Files"; objectName: "actionSubMenu"
+                        title: "&Recent Files"; objectName: "recentFilesSubMenu"
                         MenuItem { text: "RecentFile1"; objectName: "recentFile1MenuItem" }
                         MenuItem { text: "RecentFile2"; objectName: "recentFile2MenuItem" }
                     }
@@ -126,4 +126,24 @@ TestCase {
         keyPress(Qt.Key_Escape)
         compare(fileMenu.__popupVisible, false)
     }
+
+    function test_qtBug47295()
+    {
+        if (Qt.platform.os === "osx")
+            skip("MenuBar cannot be reliably tested on OS X")
+
+        var window = windowComponent.createObject()
+        waitForRendering(window.contentItem)
+        var fileMenu = findChild(window, "fileMenu")
+        verify(fileMenu)
+        tryCompare(fileMenu, "__popupVisible", false)
+        mousePress(fileMenu.__visualItem)
+        wait(200);
+        tryCompare(fileMenu, "__popupVisible", true)
+        mouseMove(fileMenu.__contentItem, 0, -10)
+        wait(200)
+        mouseRelease(fileMenu.__contentItem, 0, -10)
+        tryCompare(fileMenu, "__popupVisible", true)
+        wait(200)
+    }
 }