Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (49 commits)
  Fixed qt_x11_wait_for_window_manager
  Revert change 34f1758 on non-Synbian platforms
  Fixed QGifHandler::loopCount().
  Fix tst_QAccessiblity failure.
  fix compile error when linuxinput keyboard driver is compiled as plugin
  Fixed the context menu test case in the qgraphicsscene autotest.
  fix regression from Qt 4.5 wrt missing text pixels in QTabBar
  Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown"
  Cleanup after "QGraphicsWidget is painted twice on the first show"
  Changed qgraphicswidget autotest to use qWaitForWindowShown.
  Improved QTest::qWaitForWindowShown on X11.
  Stabilize tst_QGraphicsWidget::initialShow2 (new test)
  Make sure we define S_IFDIR on Windows
  Fix copy/pasto
  Crash when closing any top-level widget on Symbian.
  Cache the sizes of the images in an animated GIF.
  Fix the QAbstractSlider autotest.
  Use OpenVG scissor on 90/180/270 rotations and simple clips.
  Optimize single-rect IntersectClip in OpenVG using the scissor
  QGraphicsWidget is painted twice on the first show.
  ...

1 files changed, 2 insertions, 95 deletions

diff --git a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp
index 3e062b8..da83826 100644
--- a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp
+++ b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp
@@ -71,8 +71,6 @@ private slots:
     void viewportCrash();
     void task214488_layoutDirection_data();
     void task214488_layoutDirection();
-    void wheelEvent_data();
-    void wheelEvent();
 };
 
 tst_QAbstractScrollArea::tst_QAbstractScrollArea()
@@ -298,10 +296,10 @@ public:
 
         setAttribute(Qt::WA_DropSiteRegistered, true);
 
-        startTimer(200);
+        startTimer(2000);
     }
 
-    void timerEvent(QTimerEvent *)
+    void timerEvent(QTimerEvent *event)
     {
         // should not crash.
         (void)new QScrollArea(this);
@@ -387,96 +385,5 @@ void tst_QAbstractScrollArea::patternBackground()
     QCOMPARE(image.pixel(QPoint(20,20)) , QColor(Qt::red).rgb());
 }
 
-Q_DECLARE_METATYPE(QWheelEvent *);
-
-void tst_QAbstractScrollArea::wheelEvent_data()
-{
-    QTest::addColumn<QSize>("widgetSize");
-    QTest::addColumn<QPoint>("initialOffset");
-    QTest::addColumn<QWheelEvent *>("event");
-    QTest::addColumn<int>("movedX");  // -1 , 0 , or 1
-    QTest::addColumn<int>("movedY");
-
-    QPoint pos(100,100);
-    int delta =-120;
-
-    QTest::newRow("1")  << QSize(600,600) << QPoint(50,50)
-                        << new QWheelEvent(pos, delta, 0, 0, Qt::Horizontal) << 1 << 0;
-
-    QTest::newRow("2")  << QSize(600,600) << QPoint(50,50)
-                        << new QWheelEvent(pos, delta, 0, 0, Qt::Vertical) << 0 << 1;
-
-    QTest::newRow("3")  << QSize(600,600) << QPoint(50,50)
-                        << new QWheelEvent(pos, -delta, 0, 0, Qt::Horizontal) << -1 << 0;
-
-    QTest::newRow("4")  << QSize(600,600) << QPoint(50,50)
-                        << new QWheelEvent(pos, -delta, 0, 0, Qt::Vertical) << 0 << -1;
-
-    QTest::newRow("5")  << QSize(20,600) << QPoint(0,50)
-                        << new QWheelEvent(pos, delta, 0, 0, Qt::Horizontal) << 0 << 1;
-
-    QTest::newRow("6")  << QSize(20,600) << QPoint(0,50)
-                        << new QWheelEvent(pos, delta, 0, 0, Qt::Vertical) << 0 << 1;
-
-    QTest::newRow("7")  << QSize(20,600) << QPoint(0,50)
-                        << new QWheelEvent(pos, -delta, 0, 0, Qt::Horizontal) << 0 << -1;
-
-    QTest::newRow("8")  << QSize(20,600) << QPoint(0,50)
-                        << new QWheelEvent(pos, -delta, 0, 0, Qt::Vertical) << 0 << -1;
-
-    QTest::newRow("9")  << QSize(600,20) << QPoint(50,0)
-                        << new QWheelEvent(pos, delta, 0, 0, Qt::Horizontal) << 1 << 0;
-
-    QTest::newRow("a")  << QSize(600,20) << QPoint(50,0)
-                        << new QWheelEvent(pos, delta, 0, 0, Qt::Vertical) << 1 << 0;
-
-    QTest::newRow("b")  << QSize(600,20) << QPoint(50,0)
-                        << new QWheelEvent(pos, -delta, 0, 0, Qt::Horizontal) << -1 << 0;
-
-    QTest::newRow("c")  << QSize(600,20) << QPoint(50,0)
-                        << new QWheelEvent(pos, -delta, 0, 0, Qt::Vertical) << -1 << 0;
-}
-
-
-
-
-void tst_QAbstractScrollArea::wheelEvent()
-{
-    QFETCH(QSize, widgetSize);
-    QFETCH(QPoint, initialOffset);
-    QFETCH(QWheelEvent *, event);
-    QFETCH(int, movedX);
-    QFETCH(int, movedY);
-
-    QScrollArea scrollArea;
-    scrollArea.resize(200, 200);
-    QLabel widget("H e l l o");
-    widget.resize(widgetSize);
-    scrollArea.setWidget(&widget);
-    scrollArea.show();
-    QTest::qWait(20);
-
-    scrollArea.verticalScrollBar()->setValue(initialOffset.y());
-    scrollArea.horizontalScrollBar()->setValue(initialOffset.x());
-
-    QCOMPARE(scrollArea.verticalScrollBar()->value(), initialOffset.y());
-    QCOMPARE(scrollArea.horizontalScrollBar()->value(), initialOffset.x());
-
-    QApplication::sendEvent(scrollArea.viewport(), event);
-
-    if(movedX == 0)
-        QCOMPARE(scrollArea.horizontalScrollBar()->value(), initialOffset.x());
-    else
-        QVERIFY(movedX * scrollArea.horizontalScrollBar()->value() > movedX * initialOffset.x());
-
-    if(movedY == 0)
-        QCOMPARE(scrollArea.verticalScrollBar()->value(), initialOffset.y());
-    else
-        QVERIFY(movedY * scrollArea.verticalScrollBar()->value() > movedY * initialOffset.y());
-
-    delete event;
-}
-
-
 QTEST_MAIN(tst_QAbstractScrollArea)
 #include "tst_qabstractscrollarea.moc"