From 38224d8d009a0f35e4316a035636c2c2b929c524 Mon Sep 17 00:00:00 2001
From: Debao Zhang <dbzhang800@gmail.com>
Date: Thu, 8 Mar 2012 18:45:13 -0800
Subject: Make tst_qmouseevent.cpp independent of QtWidgets

Change-Id: I6759c7be44c2d890c1a745effdd70faa3467fe5b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 tests/auto/gui/kernel/qmouseevent/qmouseevent.pro    |  2 +-
 .../auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp  | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'tests/auto/gui')

diff --git a/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro b/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro
index b99c3016b0..5fa886334a 100644
--- a/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro
+++ b/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro
@@ -1,4 +1,4 @@
 CONFIG += testcase
 TARGET = tst_qmouseevent
-QT += widgets testlib
+QT += testlib
 SOURCES += tst_qmouseevent.cpp
diff --git a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
index d8f1f0640e..012502469b 100644
--- a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
+++ b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
@@ -41,21 +41,14 @@
 
 
 #include <QtTest/QtTest>
-#include <qapplication.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qdialog.h>
-
-
 #include <qevent.h>
-#include <qwidget.h>
+#include <qwindow.h>
 
-class MouseEventWidget : public QWidget
+class MouseEventWidget : public QWindow
 {
 public:
-    MouseEventWidget(QWidget *parent = 0) : QWidget(parent)
+    MouseEventWidget(QWindow *parent = 0) : QWindow(parent)
     {
-	setFocusPolicy(Qt::StrongFocus);
     }
     bool mousePressEventRecieved;
     bool mouseReleaseEventRecieved;
@@ -68,7 +61,7 @@ public:
 protected:
     void mousePressEvent(QMouseEvent *e)
     {
-	QWidget::mousePressEvent(e);
+    QWindow::mousePressEvent(e);
 	mousePressButton = e->button();
 	mousePressButtons = e->buttons();
 	mousePressModifiers = e->modifiers();
@@ -77,7 +70,7 @@ protected:
     }
     void mouseReleaseEvent(QMouseEvent *e)
     {
-	QWidget::mouseReleaseEvent(e);
+    QWindow::mouseReleaseEvent(e);
 	mouseReleaseButton = e->button();
 	mouseReleaseButtons = e->buttons();
 	mouseReleaseModifiers = e->modifiers();
@@ -179,12 +172,14 @@ void tst_QMouseEvent::checkMousePressEvent()
     int modifiers = keyPressed;
 
     QTest::mousePress(testMouseWidget, Qt::MouseButton(buttonPressed), Qt::KeyboardModifiers(keyPressed));
+    qApp->processEvents();
     QVERIFY(testMouseWidget->mousePressEventRecieved);
     QCOMPARE(testMouseWidget->mousePressButton, button);
     QCOMPARE(testMouseWidget->mousePressButtons, buttons);
     QCOMPARE(testMouseWidget->mousePressModifiers, modifiers);
 
     QTest::mouseRelease(testMouseWidget, Qt::MouseButton(buttonPressed), Qt::KeyboardModifiers(keyPressed));
+    qApp->processEvents();
 }
 
 void tst_QMouseEvent::checkMouseReleaseEvent_data()
@@ -218,6 +213,7 @@ void tst_QMouseEvent::checkMouseReleaseEvent()
     int modifiers = keyPressed;
 
     QTest::mouseClick(testMouseWidget, Qt::MouseButton(buttonReleased), Qt::KeyboardModifiers(keyPressed));
+    qApp->processEvents();
     QVERIFY(testMouseWidget->mouseReleaseEventRecieved);
     QCOMPARE(testMouseWidget->mouseReleaseButton, button);
     QCOMPARE(testMouseWidget->mouseReleaseButtons, buttons);
-- 
cgit v1.2.3