From 8e3aacf61bcfe036acdba8fac4d07d68ff0f5ab3 Mon Sep 17 00:00:00 2001 From: Takumi Asaki Date: Fri, 25 Apr 2014 17:14:31 +0900 Subject: OS X: Remove mnemonics in parentheses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In some language, mnemonics put after label text within parentheses. e.g. "&Open" is translated to "開く(&O)" in Japanese. OS X doesn't use mnemonics and '&' in label text is removed. Mnemonics in parentheses (and spaces before them) also should be removed. Change-Id: I88c0a1f60af7e148b3cf24a4e215ce807d62bce3 Reviewed-by: Tasuku Suzuki Reviewed-by: Oswald Buddenhagen --- tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tests') diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 3b891152b1..6c63d1ee90 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -1047,6 +1047,14 @@ void tst_QMenu::QTBUG_37933_ampersands_data() QTest::newRow("simple") << QString("Test") << QString("Test"); QTest::newRow("ampersand") << QString("&Test") << QString("Test"); QTest::newRow("double_ampersand") << QString("&Test && more") << QString("Test & more"); + QTest::newRow("ampersand_in_parentheses") << QString("Test(&T) (&&) more") << QString("Test (&) more"); + QTest::newRow("ampersand_in_parentheses_after_space") << QString("Test (&T)") << QString("Test"); + QTest::newRow("ampersand_in_parentheses_after_spaces") << QString("Test (&T)") << QString("Test"); + QTest::newRow("ampersand_in_parentheses_before_space") << QString("Test(&T) ") << QString("Test "); + QTest::newRow("only_ampersand_in_parentheses") << QString("(&T)") << QString(""); + QTest::newRow("only_ampersand_in_parentheses_after_space") << QString(" (&T)") << QString(""); + QTest::newRow("parentheses_after_space") << QString(" (Dummy)") << QString(" (Dummy)"); + QTest::newRow("ampersand_after_space") << QString("About &Qt Project") << QString("About Qt Project"); } void tst_qmenu_QTBUG_37933_ampersands(); -- cgit v1.2.3