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

Conflicts:
	src/network/access/qnetworkreply.cpp
	tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp

Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad

1 files changed, 16 insertions, 0 deletions

diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 35f75dbeab..da37a9a968 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -46,6 +46,8 @@
 #include <QTimer>
 #include <qdebug.h>
 
+#include <qpa/qplatformtheme.h>
+
 Q_DECLARE_METATYPE(Qt::Key);
 Q_DECLARE_METATYPE(Qt::KeyboardModifiers);
 
@@ -624,6 +626,7 @@ void tst_QMenu::tearOff()
     QScopedPointer<QMenu> menu(new QMenu(&widget));
     QVERIFY(!menu->isTearOffEnabled()); //default value
     menu->setTearOffEnabled(true);
+    menu->setTitle(QLatin1String("Same &Menu"));
     menu->addAction("aaa");
     menu->addAction("bbb");
     QVERIFY(menu->isTearOffEnabled());
@@ -646,6 +649,19 @@ void tst_QMenu::tearOff()
     QVERIFY(torn);
     QVERIFY(torn->isVisible());
 
+    // Check menu title
+    const QString cleanTitle = QPlatformTheme::removeMnemonics(menu->title()).trimmed();
+    QCOMPARE(torn->windowTitle(), cleanTitle);
+
+    // Change menu title and check again
+    menu->setTitle(QLatin1String("Sample &Menu"));
+    const QString newCleanTitle = QPlatformTheme::removeMnemonics(menu->title()).trimmed();
+    QCOMPARE(torn->windowTitle(), newCleanTitle);
+
+    // Clear menu title and check again
+    menu->setTitle(QString());
+    QCOMPARE(torn->windowTitle(), QString());
+
     menu->hideTearOffMenu();
     QVERIFY(!menu->isTearOffMenuVisible());
     QVERIFY(!torn->isVisible());