diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:45:38 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:46:19 +0200 |
commit | d671acd5b296b83440db9836a92189c501c87ff3 (patch) | |
tree | bd9c1a000e17c70124c207666cfb3276b5518ffd /tests/auto/qfocusevent | |
parent | 42f5786104f9eef9542df2c7469a03324978281d (diff) | |
parent | 4f2138ecfbdc58e5cb5b0c7d762197ef69752957 (diff) |
Merge remote branch 'staging/master' into refactor
Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/glxconvenience/qglxconvenience.cpp
src/plugins/platforms/platforms.pro
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/plugins/platforms/xcb/qxcbwindowsurface.cpp
src/widgets/kernel/qwidget_qpa.cpp
tests/auto/qvariant/tst_qvariant.cpp
Diffstat (limited to 'tests/auto/qfocusevent')
-rw-r--r-- | tests/auto/qfocusevent/tst_qfocusevent.cpp | 33 |
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 |