Cocoa: Do not process ampersands in menus twice.

When syncing between QAction and native NSMenuItems, the ampersands
(mnemonics) were removed twice. This lead to double ampersands being
removed instead of replace with single ones.

Task-number: QTBUG-37933
Change-Id: If1d9cd247b467472647b22b38460b44b03f13d82
Reviewed-by: Liang Qi <liang.qi@digia.com>

3 files changed, 86 insertions, 1 deletions

diff --git a/tests/auto/widgets/widgets/qmenu/qmenu.pro b/tests/auto/widgets/widgets/qmenu/qmenu.pro
index 9efd0302bf..7c1315afa8 100644
--- a/tests/auto/widgets/widgets/qmenu/qmenu.pro
+++ b/tests/auto/widgets/widgets/qmenu/qmenu.pro
@@ -2,4 +2,7 @@ CONFIG += testcase
 TARGET = tst_qmenu
 QT += widgets testlib
 SOURCES  += tst_qmenu.cpp
-
+macx:{
+    OBJECTIVE_SOURCES += tst_qmenu_mac.mm
+    LIBS += -lobjc
+}
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index f7dff7bc57..b4be24f0e0 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -116,6 +116,10 @@ private slots:
     void QTBUG30595_rtl_submenu();
     void QTBUG20403_nested_popup_on_shortcut_trigger();
     void QTBUG_10735_crashWithDialog();
+#ifdef Q_OS_MAC
+    void QTBUG_37933_ampersands_data();
+    void QTBUG_37933_ampersands();
+#endif
 protected slots:
     void onActivated(QAction*);
     void onHighlighted(QAction*);
@@ -1025,5 +1029,24 @@ void tst_QMenu::QTBUG_10735_crashWithDialog()
     menu.activateAction(0);
 }
 
+#ifdef Q_OS_MAC
+void tst_QMenu::QTBUG_37933_ampersands_data()
+{
+    QTest::addColumn<QString>("title");
+    QTest::addColumn<QString>("visibleTitle");
+    QTest::newRow("simple") << QString("Test") << QString("Test");
+    QTest::newRow("ampersand") << QString("&Test") << QString("Test");
+    QTest::newRow("double_ampersand") << QString("&Test && more") << QString("Test & more");
+}
+
+void tst_qmenu_QTBUG_37933_ampersands();
+
+void tst_QMenu::QTBUG_37933_ampersands()
+{
+    // external in .mm file
+    tst_qmenu_QTBUG_37933_ampersands();
+}
+#endif
+
 QTEST_MAIN(tst_QMenu)
 #include "tst_qmenu.moc"
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu_mac.mm b/tests/auto/widgets/widgets/qmenu/tst_qmenu_mac.mm
new file mode 100644
index 0000000000..dd0597d1ae
--- /dev/null
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu_mac.mm
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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 Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 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 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+#include <QMenu>
+#include <QTest>
+
+void tst_qmenu_QTBUG_37933_ampersands()
+{
+    QMenu m;
+    QFETCH(QString, title);
+    QFETCH(QString, visibleTitle);
+    m.addAction(title);
+
+    NSMenu* nativeMenu = m.toNSMenu();
+    Q_ASSERT(nativeMenu != 0);
+    NSMenuItem* item = [nativeMenu itemAtIndex:0];
+    Q_ASSERT(item != 0);
+    QCOMPARE(QString::fromUtf8([[item title] UTF8String]), visibleTitle);
+}