Changeset 46836 in vbox

Timestamp:

Jun 27, 2013 12:24:18 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac host: Remove old Qt4.4 hack related to popup-menu keyboard handling.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIMainDialog.cpp (modified) (2 diffs)
• selector/UISelectorWindow.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp

@@ -168 +168 @@
                   }
               }
-#if QT_VERSION < 0x040400
-              else if (currentModifiers == Qt::ShiftModifier)
-#else
               else if (currentModifiers == Qt::ControlModifier)
-#endif
               {
                   if (!mFileForProxyIcon.isEmpty())
@@ -249 +245 @@
 void QIMainDialog::keyPressEvent(QKeyEvent *pEvent)
 {
-#if defined (Q_WS_MAC) && (QT_VERSION < 0x040402)
-    /* Bug in Qt below 4.4.2.
-     * The key events are send to the current window even if a menu is shown & has the focus.
-     * See http://trolltech.com/developer/task-tracker/index_html?method=entry&id=214681. */
-    if (::darwinIsMenuOpen())
-        return;
-#endif /* defined (Q_WS_MAC) && (QT_VERSION < 0x040402) */
-
     /* Make sure that we only proceed if no
      * popup or other modal widgets are open. */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1055 +1055 @@
             break;
         }
-# if (QT_VERSION < 0x040402)
-        case QEvent::KeyPress:
-        {
-            /* Bug in Qt below 4.4.2. The key events are send to the current
-             * window even if a menu is shown & has the focus. See
-             * http://trolltech.com/developer/task-tracker/index_html?method=entry&id=214681. */
-            if (::darwinIsMenuOpen())
-                return true;
-            break;
-        }
-# endif
         default:
             break;