1 files changed, 0 insertions, 33 deletions
diff --git a/tests/auto/qfocusevent/tst_qfocusevent.cpp b/tests/auto/qfocusevent/tst_qfocusevent.cpp
index 401f4a7075..e79153412a 100644
--- a/tests/auto/qfocusevent/tst_qfocusevent.cpp
+++ b/tests/auto/qfocusevent/tst_qfocusevent.cpp
@@ -43,13 +43,7 @@
 #include <QtTest/QtTest>
 #include <qapplication.h>
 #include <qlineedit.h>
-
-#if defined (QT3_SUPPORT)
-#include <q3popupmenu.h>
-#else
 #include <qmenu.h>
-#endif
-
 #include <qlabel.h>
 #include <qdialog.h>
 #include <qevent.h>
@@ -264,32 +258,6 @@ void tst_QFocusEvent::checkReason_Popup()
     initWidget();
 
     // Now test the popup reason
-#if defined (QT3_SUPPORT)
-    Q3PopupMenu* popupMenu = new Q3PopupMenu( testFocusWidget );
-    popupMenu->insertItem( "Test" );
-    popupMenu->popup( QPoint(0,0) );
-    QTest::qWait(50);
-
-    QTRY_VERIFY(childFocusWidgetOne->focusOutEventLostFocus);
-
-    QVERIFY( childFocusWidgetOne->hasFocus() );
-    QVERIFY( !childFocusWidgetOne->focusInEventRecieved );
-    QVERIFY( childFocusWidgetOne->focusOutEventRecieved );
-    QVERIFY( !childFocusWidgetTwo->focusInEventRecieved );
-    QVERIFY( !childFocusWidgetTwo->focusOutEventRecieved );
-    QCOMPARE( childFocusWidgetOne->focusOutEventReason, int(Qt::PopupFocusReason));
-
-    popupMenu->hide();
-
-    QVERIFY(childFocusWidgetOne->focusInEventRecieved);
-    QVERIFY(childFocusWidgetOne->focusInEventGotFocus);
-
-    QVERIFY( childFocusWidgetOne->hasFocus() );
-    QVERIFY( childFocusWidgetOne->focusInEventRecieved );
-    QVERIFY( childFocusWidgetOne->focusOutEventRecieved );
-    QVERIFY( !childFocusWidgetTwo->focusInEventRecieved );
-    QVERIFY( !childFocusWidgetTwo->focusOutEventRecieved );
-#else
     QMenu* popupMenu = new QMenu( testFocusWidget );
     popupMenu->addMenu( "Test" );
     popupMenu->popup( QPoint(0,0) );
@@ -314,7 +282,6 @@ void tst_QFocusEvent::checkReason_Popup()
     QVERIFY( childFocusWidgetOne->focusOutEventRecieved );
     QVERIFY( !childFocusWidgetTwo->focusInEventRecieved );
     QVERIFY( !childFocusWidgetTwo->focusOutEventRecieved );
-#endif
 }
 
 #ifdef Q_WS_MAC