Ticket #46238: qt4-deactivate-menurole-heuristics.patch

src/gui/widgets/

@@ -638 +638 @@
 
 static NSMenuItem *createNSMenuItem(const QString &title)
 {
-    NSMenuItem *item = [[NSMenuItem alloc] 
+    NSMenuItem *item = [[NSMenuItem alloc]
                          initWithTitle:qt_mac_QStringToNSString(title)
                          action:@selector(qtDispatcherToQAction:) keyEquivalent:@""];
     [item setTarget:nil];
@@ -852 +852 @@
 #endif
         break;
     case QAction::TextHeuristicRole: {
-        QString aboutString = QMenuBar::tr("About").toLower();
-        if (t.startsWith(aboutString) || t.endsWith(aboutString)) {
-            if (t.indexOf(QRegExp(QString::fromLatin1("qt$"), Qt::CaseInsensitive)) == -1) {
-#ifndef QT_MAC_USE_COCOA
-                ret = kHICommandAbout;
-#else
-                ret = [loader aboutMenuItem];
-#endif
-            } else {
-#ifndef QT_MAC_USE_COCOA
-                ret = kHICommandAboutQt;
-#else
-                ret = [loader aboutQtMenuItem];
-#endif
-            }
-        } else if (t.startsWith(QMenuBar::tr("Config").toLower())
-                   || t.startsWith(QMenuBar::tr("Preference").toLower())
-                   || t.startsWith(QMenuBar::tr("Options").toLower())
-                   || t.startsWith(QMenuBar::tr("Setting").toLower())
-                   || t.startsWith(QMenuBar::tr("Setup").toLower())) {
-#ifndef QT_MAC_USE_COCOA
-            ret = kHICommandPreferences;
-#else
-            ret = [loader preferencesMenuItem];
-#endif
-        } else if (t.startsWith(QMenuBar::tr("Quit").toLower())
+           if (t.startsWith(QMenuBar::tr("Quit").toLower())
                    || t.startsWith(QMenuBar::tr("Exit").toLower())) {
 #ifndef QT_MAC_USE_COCOA
             ret = kHICommandQuit;