AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make tst_qmouseevent.cpp independent of QtWidgets

Browse Source 
Change-Id: I6759c7be44c2d890c1a745effdd70faa3467fe5b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Debao Zhang 2012-03-08 18:45:13 -08:00 committed by Qt by Nokia
parent 37c46fee30
commit 38224d8d00
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/gui/kernel/qmouseevent/qmouseevent.pro
View File

@ -1,4 +1,4 @@
CONFIG += testcase
TARGET = tst_qmouseevent
QT += widgets testlib
QT += testlib
SOURCES += tst_qmouseevent.cpp

20
tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
View File

@ -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);