1 files changed, 9 insertions, 6 deletions
diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp
index 320cd8d..aa6caae 100644
--- a/tests/auto/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/qmenubar/tst_qmenubar.cpp
@@ -168,7 +168,7 @@ private slots:
     void task256322_highlight();
     void menubarSizeHint();
     void taskQTBUG4965_escapeEaten();
-    
+
 #if defined(QT3_SUPPORT)
     void indexBasedInsertion_data();
     void indexBasedInsertion();
@@ -1360,7 +1360,7 @@ tst_QMenuBar::allowActiveAndDisabled()
     // disabled menu items are added
 
     QMenu fileMenu("&File");
-    // Task 241043 : check that second menu is activated 
+    // Task 241043 : check that second menu is activated
     // if all items are disabled
     QAction *act = fileMenu.addAction("Disabled");
     act->setEnabled(false);
@@ -1388,7 +1388,7 @@ tst_QMenuBar::allowActiveAndDisabled()
         QCOMPARE(mb->activeAction()->text(), fileMenu.title());
     else
         QCOMPARE(mb->activeAction()->text(), fileMenu.title());
-    
+
     mb->hide();
 #endif //Q_WS_MAC
 }
@@ -1603,7 +1603,7 @@ void tst_QMenuBar::menubarSizeHint()
         virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, const QWidget * widget = 0 ) const
         {
             // I chose strange values (prime numbers to be more sure that the size of the menubar is correct)
-            switch (metric) 
+            switch (metric)
             {
             case QStyle::PM_MenuBarItemSpacing:
                 return 7;
@@ -1621,7 +1621,7 @@ void tst_QMenuBar::menubarSizeHint()
 
     QMenuBar mb;
     mb.setNativeMenuBar(false); //we can't check the geometry of native menubars
-		
+
     mb.setStyle(&style);
     //this is a list of arbitrary strings so that we check the geometry
     QStringList list = QStringList() << "trer" << "ezrfgtgvqd" << "sdgzgzerzerzer" << "eerzertz"  << "er";
@@ -1667,12 +1667,15 @@ void tst_QMenuBar::menubarSizeHint()
 
 void tst_QMenuBar::taskQTBUG4965_escapeEaten()
 {
+#ifdef Q_WS_MAC
+    QSKIP("On Mac, do not test the menubar with escape key", SkipAll);
+#endif
     QMenuBar menubar;
     QMenu menu("menu1");
     QAction *first = menubar.addMenu(&menu);
     menu.addAction("quit", &menubar, SLOT(close()), QKeySequence("ESC"));
     menubar.show();
-    menubar.setActiveWindow();
+    QApplication::setActiveWindow(&menubar);
     QTest::qWaitForWindowShown(&menubar);
     menubar.setActiveAction(first);
     QTRY_VERIFY(menu.isVisible());