summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@qt.io>2017-04-25 16:54:29 -0700
committerGabriel de Dietrich <gabriel.dedietrich@qt.io>2017-04-26 22:27:53 +0000
commit445191bba8216276e6200157906ca9d138d7be04 (patch)
treef9193b6d1843f7e0e3988c47b10edbf285919e14 /tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
parent6107f63f934b2342bc34d3bc720f267159204cf9 (diff)
QMenu: Display the menu title on the torn-off menu's title bar
Change-Id: If16e262a6c8b39dff517cc105cf55686d4c22582 Task-number: QTBUG-11693 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp')
-rw-r--r--tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp16
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 e5e2e157c5..f0fb7bc367 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);
@@ -622,6 +624,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());
@@ -644,6 +647,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());