diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-14 17:08:40 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-14 17:08:40 (GMT) |
| commit | ebd0823fa2e8b1a19bff32a39c4051ba8535d501 (patch) | |
| tree | 04e9fa95c15ccbda8acca965b40cc2e8245968fb /tests/auto/qwidget/tst_qwidget.cpp | |
| parent | e8455f867cb998b86e26fcce88deac1c757b6fcc (diff) | |
| parent | d1edbe110240e5ede67f10cf6620cc6eef26b359 (diff) | |
| download | Qt-ebd0823fa2e8b1a19bff32a39c4051ba8535d501.zip Qt-ebd0823fa2e8b1a19bff32a39c4051ba8535d501.tar.gz Qt-ebd0823fa2e8b1a19bff32a39c4051ba8535d501.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'tests/auto/qwidget/tst_qwidget.cpp')
| -rw-r--r-- | tests/auto/qwidget/tst_qwidget.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index 47cd860..86caddb 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -350,7 +350,7 @@ private slots: void setClearAndResizeMask(); void maskedUpdate(); -#if defined(Q_WS_WIN) || defined(Q_WS_X11) +#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS) void syntheticEnterLeave(); #endif void windowFlags(); @@ -8990,7 +8990,7 @@ void tst_QWidget::maskedUpdate() QCOMPARE(grandChild.paintedRegion, QRegion(grandChild.rect())); // Full update. } -#if defined(Q_WS_X11) || defined(Q_WS_WIN) +#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS) void tst_QWidget::syntheticEnterLeave() { class MyWidget : public QWidget @@ -9275,6 +9275,7 @@ void tst_QWidget::rectOutsideCoordinatesLimit_task144779() #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&main); #endif + QCursor::setPos(main.pos()); //get the cursor out of the picture QTest::qWait(100); QPixmap pixmap = QPixmap::grabWindow(main.winId()); |