Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (37 commits)
  Update Symbian DEF-files
  Revert all QScroller and QFlickGesture related code.
  Improve DEFINES crossplatform compatibility in Symbian builds.
  Fix regression that caused waitForXXX(-1) to fail.
  Freezing the QtCore defs again for 4.8.
  X11: Keep the menubar inside the widgetbox window in toplevel mode
  Retain ABI and API compatibility when Qt is built with EGL.
  Allow 'typeinfo <file>' lines in qmldir.
  qmlplugindump: Use command line options with a single dash.
  qmlplugindump: Allow dumping by path without URI.
  Move qmldump from Qt Creator to Qt.
  QmlDebug: Fix QmlOstPlugin compilation failure
  Fix GLES2 include path for applications when not using the dash shell
  fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e
  QmlDebug: Fix QmlOstPlugin compilation failure
  Enable performance monitoring at application startup.
  Remove not supported qmake api
  Added Wayland selection support.
  Added Wayland selection support.
  Add the wayland client libraries to rpath if we use rpath
  ...

5 files changed, 47 insertions, 545 deletions

diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 22c5e51..0014b08 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -142,7 +142,6 @@ SUBDIRS=\
     qregion \
     qscrollarea \
     qscrollbar \
-    qscroller \
     qsharedpointer_and_qwidget \
     qshortcut \
     qsidebar \
diff --git a/tests/auto/qscroller/qscroller.pro b/tests/auto/qscroller/qscroller.pro
deleted file mode 100644
index 845dcb9..0000000
--- a/tests/auto/qscroller/qscroller.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-load(qttest_p4)
-
-SOURCES += tst_qscroller.cpp
diff --git a/tests/auto/qscroller/tst_qscroller.cpp b/tests/auto/qscroller/tst_qscroller.cpp
deleted file mode 100644
index a9b3d9f..0000000
--- a/tests/auto/qscroller/tst_qscroller.cpp
+++ /dev/null
@@ -1,537 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the $MODULE$ of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtGui>
-#include <QtTest>
-// #include <QDebug>
-
-class tst_QScrollerWidget : public QWidget
-{
-public:
-    tst_QScrollerWidget()
-        : QWidget()
-    {
-        reset();
-    }
-
-    void reset()
-    {
-        receivedPrepare = false;
-        receivedScroll = false;
-        receivedFirst = false;
-        receivedLast = false;
-        receivedOvershoot = false;
-    }
-
-    bool event(QEvent *e)
-    {
-        switch (e->type()) {
-        case QEvent::Gesture:
-            e->setAccepted(false); // better reject the event or QGestureManager will make trouble
-            return false;
-
-        case QEvent::ScrollPrepare:
-            {
-                receivedPrepare = true;
-                QScrollPrepareEvent *se = static_cast<QScrollPrepareEvent *>(e);
-                se->setViewportSize(QSizeF(100,100));
-                se->setContentPosRange(scrollArea);
-                se->setContentPos(scrollPosition);
-                se->accept();
-                return true;
-            }
-
-        case QEvent::Scroll:
-            {
-                receivedScroll = true;
-                QScrollEvent *se = static_cast<QScrollEvent *>(e);
-                // qDebug() << "Scroll for"<<this<<"pos"<<se->scrollPos()<<"ov"<<se->overshoot()<<"first"<<se->isFirst()<<"last"<<se->isLast();
-
-                if (se->scrollState() == QScrollEvent::ScrollStarted)
-                    receivedFirst = true;
-                if (se->scrollState() == QScrollEvent::ScrollFinished)
-                    receivedLast = true;
-
-                currentPos = se->contentPos();
-                overshoot = se->overshootDistance();
-                if (!qFuzzyCompare( overshoot.x() + 1.0, 1.0 ) ||
-                    !qFuzzyCompare( overshoot.y() + 1.0, 1.0 ))
-                    receivedOvershoot = true;
-                return true;
-            }
-
-        default:
-            return QObject::event(e);
-        }
-    }
-
-
-    QRectF scrollArea;
-    QPointF scrollPosition;
-
-    bool receivedPrepare;
-    bool receivedScroll;
-    bool receivedFirst;
-    bool receivedLast;
-    bool receivedOvershoot;
-
-    QPointF currentPos;
-    QPointF overshoot;
-};
-
-
-class tst_QScroller : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QScroller() { }
-    ~tst_QScroller() { }
-
-private:
-    void kineticScroll( tst_QScrollerWidget *sw, QPointF from, QPoint touchStart, QPoint touchUpdate, QPoint touchEnd);
-    void kineticScrollNoTest( tst_QScrollerWidget *sw, QPointF from, QPoint touchStart, QPoint touchUpdate, QPoint touchEnd);
-
-private slots:
-    void staticScrollers();
-    void scrollerProperties();
-    void scrollTo();
-    void scroll();
-    void overshoot();
-};
-
-/*! \internal
-    Generates touchBegin, touchUpdate and touchEnd events to trigger scrolling.
-    Tests some in between states but does not wait until scrolling is finished.
-*/
-void tst_QScroller::kineticScroll( tst_QScrollerWidget *sw, QPointF from, QPoint touchStart, QPoint touchUpdate, QPoint touchEnd)
-{
-    sw->scrollPosition = from;
-    sw->currentPos= from;
-
-    QScroller *s1 = QScroller::scroller(sw);
-    QCOMPARE( s1->state(), QScroller::Inactive );
-
-    QScrollerProperties sp1 = QScroller::scroller(sw)->scrollerProperties();
-    int fps = 60;
-
-    QTouchEvent::TouchPoint rawTouchPoint;
-    rawTouchPoint.setId(0);
-
-    // send the touch begin event
-    QTouchEvent::TouchPoint touchPoint(0);
-    touchPoint.setState(Qt::TouchPointPressed);
-    touchPoint.setPos(touchStart);
-    touchPoint.setScenePos(touchStart);
-    touchPoint.setScreenPos(touchStart);
-    QTouchEvent touchEvent1(QEvent::TouchBegin,
-                            QTouchEvent::TouchScreen,
-                            Qt::NoModifier,
-                            Qt::TouchPointPressed,
-                            (QList<QTouchEvent::TouchPoint>() << touchPoint));
-    QApplication::sendEvent(sw, &touchEvent1);
-
-    QCOMPARE( s1->state(), QScroller::Pressed );
-
-    // send the touch update far enough to trigger a scroll
-    QTest::qWait(200); // we need to wait a little or else the speed would be infinite. now we have around 500 pixel per second.
-    touchPoint.setPos(touchUpdate);
-    touchPoint.setScenePos(touchUpdate);
-    touchPoint.setScreenPos(touchUpdate);
-    QTouchEvent touchEvent2(QEvent::TouchUpdate,
-                            QTouchEvent::TouchScreen,
-                            Qt::NoModifier,
-                            Qt::TouchPointMoved,
-                            (QList<QTouchEvent::TouchPoint>() << touchPoint));
-    QApplication::sendEvent(sw, &touchEvent2);
-
-    QCOMPARE( s1->state(), QScroller::Dragging );
-    QCOMPARE( sw->receivedPrepare, true );
-
-
-    QTest::qWait(1000 / fps * 2); // wait until the first scroll move
-    QCOMPARE( sw->receivedFirst, true );
-    QCOMPARE( sw->receivedScroll, true );
-    QCOMPARE( sw->receivedOvershoot, false );
-
-    // note that the scrolling goes in a different direction than the mouse move
-    QPoint calculatedPos = from.toPoint() - touchUpdate - touchStart;
-    QVERIFY(qAbs(sw->currentPos.x() - calculatedPos.x()) < 1.0);
-    QVERIFY(qAbs(sw->currentPos.y() - calculatedPos.y()) < 1.0);
-
-    // send the touch end
-    touchPoint.setPos(touchEnd);
-    touchPoint.setScenePos(touchEnd);
-    touchPoint.setScreenPos(touchEnd);
-    QTouchEvent touchEvent5(QEvent::TouchEnd,
-                            QTouchEvent::TouchScreen,
-                            Qt::NoModifier,
-                            Qt::TouchPointReleased,
-                            (QList<QTouchEvent::TouchPoint>() << touchPoint));
-    QApplication::sendEvent(sw, &touchEvent5);
-}
-
-/*! \internal
-    Generates touchBegin, touchUpdate and touchEnd events to trigger scrolling.
-    This function does not have any in between tests, it does not expect the scroller to actually scroll.
-*/
-void tst_QScroller::kineticScrollNoTest( tst_QScrollerWidget *sw, QPointF from, QPoint touchStart, QPoint touchUpdate, QPoint touchEnd)
-{
-    sw->scrollPosition = from;
-    sw->currentPos = from;
-
-    QScroller *s1 = QScroller::scroller(sw);
-    QCOMPARE( s1->state(), QScroller::Inactive );
-
-    QScrollerProperties sp1 = s1->scrollerProperties();
-    int fps = 60;
-
-    QTouchEvent::TouchPoint rawTouchPoint;
-    rawTouchPoint.setId(0);
-
-    // send the touch begin event
-    QTouchEvent::TouchPoint touchPoint(0);
-    touchPoint.setState(Qt::TouchPointPressed);
-    touchPoint.setPos(touchStart);
-    touchPoint.setScenePos(touchStart);
-    touchPoint.setScreenPos(touchStart);
-    QTouchEvent touchEvent1(QEvent::TouchBegin,
-                            QTouchEvent::TouchScreen,
-                            Qt::NoModifier,
-                            Qt::TouchPointPressed,
-                            (QList<QTouchEvent::TouchPoint>() << touchPoint));
-    QApplication::sendEvent(sw, &touchEvent1);
-
-    // send the touch update far enough to trigger a scroll
-    QTest::qWait(200); // we need to wait a little or else the speed would be infinite. now we have around 500 pixel per second.
-    touchPoint.setPos(touchUpdate);
-    touchPoint.setScenePos(touchUpdate);
-    touchPoint.setScreenPos(touchUpdate);
-    QTouchEvent touchEvent2(QEvent::TouchUpdate,
-                            QTouchEvent::TouchScreen,
-                            Qt::NoModifier,
-                            Qt::TouchPointMoved,
-                            (QList<QTouchEvent::TouchPoint>() << touchPoint));
-    QApplication::sendEvent(sw, &touchEvent2);
-
-    QTest::qWait(1000 / fps * 2); // wait until the first scroll move
-
-    // send the touch end
-    touchPoint.setPos(touchEnd);
-    touchPoint.setScenePos(touchEnd);
-    touchPoint.setScreenPos(touchEnd);
-    QTouchEvent touchEvent5(QEvent::TouchEnd,
-                            QTouchEvent::TouchScreen,
-                            Qt::NoModifier,
-                            Qt::TouchPointReleased,
-                            (QList<QTouchEvent::TouchPoint>() << touchPoint));
-    QApplication::sendEvent(sw, &touchEvent5);
-}
-
-
-void tst_QScroller::staticScrollers()
-{
-    // scrollers
-    {
-        QObject *o1 = new QObject(this);
-        QObject *o2 = new QObject(this);
-
-        // get scroller for object
-        QScroller *s1 = QScroller::scroller(o1);
-        QScroller *s2 = QScroller::scroller(o2);
-
-        QVERIFY(s1);
-        QVERIFY(s2);
-        QVERIFY(s1 != s2);
-
-        QVERIFY(!QScroller::scroller(static_cast<const QObject*>(0)));
-        QCOMPARE(QScroller::scroller(o1), s1);
-
-        delete o1;
-        delete o2;
-    }
-
-    // the same for properties
-    {
-        QObject *o1 = new QObject(this);
-        QObject *o2 = new QObject(this);
-
-        // get scroller for object
-        QScrollerProperties sp1 = QScroller::scroller(o1)->scrollerProperties();
-        QScrollerProperties sp2 = QScroller::scroller(o2)->scrollerProperties();
-
-        // default properties should be the same
-        QVERIFY(sp1 == sp2);
-
-        QCOMPARE(QScroller::scroller(o1)->scrollerProperties(), sp1);
-
-        delete o1;
-        delete o2;
-    }
-}
-
-void tst_QScroller::scrollerProperties()
-{
-    QObject *o1 = new QObject(this);
-    QScrollerProperties sp1 = QScroller::scroller(o1)->scrollerProperties();
-
-    QScrollerProperties::ScrollMetric metrics[] =
-    {
-        QScrollerProperties::MousePressEventDelay,                    // qreal [s]
-        QScrollerProperties::DragStartDistance,                       // qreal [m]
-        QScrollerProperties::DragVelocitySmoothingFactor,             // qreal [0..1/s]  (complex calculation involving time) v = v_new* DASF + v_old * (1-DASF)
-        QScrollerProperties::AxisLockThreshold,                       // qreal [0..1] atan(|min(dx,dy)|/|max(dx,dy)|)
-
-        QScrollerProperties::DecelerationFactor,                      // slope of the curve
-
-        QScrollerProperties::MinimumVelocity,                         // qreal [m/s]
-        QScrollerProperties::MaximumVelocity,                         // qreal [m/s]
-        QScrollerProperties::MaximumClickThroughVelocity,             // qreal [m/s]
-
-        QScrollerProperties::AcceleratingFlickMaximumTime,            // qreal [s]
-        QScrollerProperties::AcceleratingFlickSpeedupFactor,          // qreal [1..]
-
-        QScrollerProperties::SnapPositionRatio,                       // qreal [0..1]
-        QScrollerProperties::SnapTime,                                // qreal [s]
-
-        QScrollerProperties::OvershootDragResistanceFactor,           // qreal [0..1]
-        QScrollerProperties::OvershootDragDistanceFactor,             // qreal [0..1]
-        QScrollerProperties::OvershootScrollDistanceFactor,           // qreal [0..1]
-        QScrollerProperties::OvershootScrollTime,                     // qreal [s]
-    };
-
-    for (unsigned int i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++) {
-        sp1.setScrollMetric(metrics[i], 0.9);
-        QCOMPARE(sp1.scrollMetric(metrics[i]).toDouble(), 0.9);
-    }
-    sp1.setScrollMetric(QScrollerProperties::ScrollingCurve, QEasingCurve(QEasingCurve::OutQuart));
-    QCOMPARE(sp1.scrollMetric(QScrollerProperties::ScrollingCurve).toEasingCurve().type(), QEasingCurve::OutQuart);
-
-    sp1.setScrollMetric(QScrollerProperties::HorizontalOvershootPolicy, QVariant::fromValue(QScrollerProperties::OvershootAlwaysOff));
-    QCOMPARE(sp1.scrollMetric(QScrollerProperties::HorizontalOvershootPolicy).value<QScrollerProperties::OvershootPolicy>(), QScrollerProperties::OvershootAlwaysOff);
-
-    sp1.setScrollMetric(QScrollerProperties::VerticalOvershootPolicy, QVariant::fromValue(QScrollerProperties::OvershootAlwaysOn));
-    QCOMPARE(sp1.scrollMetric(QScrollerProperties::VerticalOvershootPolicy).value<QScrollerProperties::OvershootPolicy>(), QScrollerProperties::OvershootAlwaysOn);
-
-    sp1.setScrollMetric(QScrollerProperties::FrameRate, QVariant::fromValue(QScrollerProperties::Fps20));
-    QCOMPARE(sp1.scrollMetric(QScrollerProperties::FrameRate).value<QScrollerProperties::FrameRates>(), QScrollerProperties::Fps20);
-}
-
-void tst_QScroller::scrollTo()
-{
-    {
-        tst_QScrollerWidget *sw = new tst_QScrollerWidget();
-        sw->scrollArea = QRectF( 0, 0, 1000, 1000 );
-        sw->scrollPosition = QPointF( 500, 500 );
-
-        QScroller *s1 = QScroller::scroller(sw);
-        QCOMPARE( s1->state(), QScroller::Inactive );
-
-        // a normal scroll
-        s1->scrollTo(QPointF(100,100), 100);
-        QTest::qWait(200);
-
-        QCOMPARE( sw->receivedPrepare, true );
-        QCOMPARE( sw->receivedScroll, true );
-        QCOMPARE( sw->receivedFirst, true );
-        QCOMPARE( sw->receivedLast, true );
-        QCOMPARE( sw->receivedOvershoot, false );
-        QVERIFY(qFuzzyCompare( sw->currentPos.x(), 100 ));
-        QVERIFY(qFuzzyCompare( sw->currentPos.y(), 100 ));
-
-        delete sw;
-    }
-}
-
-void tst_QScroller::scroll()
-{
-#if defined(Q_OS_MACX) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6)
-    QSKIP("Mac OS X < 10.6 does not support QTouchEvents", SkipAll);
-    return;
-#endif
-
-#ifndef QT_NO_GESTURES
-    // -- good case. normal scroll
-    tst_QScrollerWidget *sw = new tst_QScrollerWidget();
-    sw->scrollArea = QRectF(0, 0, 1000, 1000);
-    QScroller::grabGesture(sw, QScroller::TouchGesture);
-    sw->setGeometry(100, 100, 400, 300);
-
-    QScroller *s1 = QScroller::scroller(sw);
-    kineticScroll(sw, QPointF(500, 500), QPoint(0, 0), QPoint(100, 100), QPoint(200, 200));
-    // now we should be scrolling
-    QCOMPARE( s1->state(), QScroller::Scrolling );
-
-    // wait until finished, check that no further first scroll is send
-    sw->receivedFirst = false;
-    sw->receivedScroll = false;
-    while (s1->state() == QScroller::Scrolling)
-        QTest::qWait(100);
-
-    QCOMPARE( sw->receivedFirst, false );
-    QCOMPARE( sw->receivedScroll, true );
-    QCOMPARE( sw->receivedLast, true );
-    QVERIFY(sw->currentPos.x() < 400);
-    QVERIFY(sw->currentPos.y() < 400);
-
-    // -- try to scroll when nothing to scroll
-
-    sw->reset();
-    sw->scrollArea = QRectF(0, 0, 0, 1000);
-    kineticScrollNoTest(sw, QPointF(0, 500), QPoint(0, 0), QPoint(100, 0), QPoint(200, 0));
-
-    while (s1->state() != QScroller::Inactive)
-        QTest::qWait(20);
-
-    QCOMPARE(sw->currentPos.x(), 0.0);
-    QCOMPARE(sw->currentPos.y(), 500.0);
-
-    delete sw;
-#endif
-}
-
-void tst_QScroller::overshoot()
-{
-#if defined(Q_OS_MACX) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6)
-    QSKIP("Mac OS X < 10.6 does not support QTouchEvents", SkipAll);
-    return;
-#endif
-
-#ifndef QT_NO_GESTURES
-    tst_QScrollerWidget *sw = new tst_QScrollerWidget();
-    sw->scrollArea = QRectF(0, 0, 1000, 1000);
-    QScroller::grabGesture(sw, QScroller::TouchGesture);
-    sw->setGeometry(100, 100, 400, 300);
-
-    QScroller *s1 = QScroller::scroller(sw);
-    QScrollerProperties sp1 = s1->scrollerProperties();
-
-    sp1.setScrollMetric(QScrollerProperties::OvershootDragResistanceFactor, 0.5);
-    sp1.setScrollMetric(QScrollerProperties::OvershootDragDistanceFactor, 0.2);
-    sp1.setScrollMetric(QScrollerProperties::OvershootScrollDistanceFactor, 0.2);
-
-    // -- try to scroll with overshoot (when scrollable good case)
-
-    sp1.setScrollMetric(QScrollerProperties::HorizontalOvershootPolicy, QVariant::fromValue(QScrollerProperties::OvershootWhenScrollable));
-    s1->setScrollerProperties(sp1);
-    kineticScrollNoTest(sw, QPointF(500, 500), QPoint(0, 0), QPoint(400, 0), QPoint(490, 0));
-
-    while (s1->state() != QScroller::Inactive)
-        QTest::qWait(20);
-
-    //qDebug() << "Overshoot fuzzy: "<<sw->currentPos;
-    QVERIFY(qFuzzyCompare( sw->currentPos.x(), 0 ));
-    QVERIFY(qFuzzyCompare( sw->currentPos.y(), 500 ));
-    QCOMPARE( sw->receivedOvershoot, true );
-
-    // -- try to scroll with overshoot (when scrollable bad case)
-    sw->reset();
-    sw->scrollArea = QRectF(0, 0, 0, 1000);
-
-    sp1.setScrollMetric(QScrollerProperties::HorizontalOvershootPolicy, QVariant::fromValue(QScrollerProperties::OvershootWhenScrollable));
-    s1->setScrollerProperties(sp1);
-    kineticScrollNoTest(sw, QPointF(0, 500), QPoint(0, 0), QPoint(400, 0), QPoint(490, 0));
-
-    while (s1->state() != QScroller::Inactive)
-        QTest::qWait(20);
-
-    //qDebug() << "Overshoot fuzzy: "<<sw->currentPos;
-    QVERIFY(qFuzzyCompare( sw->currentPos.x(), 0 ));
-    QVERIFY(qFuzzyCompare( sw->currentPos.y(), 500 ));
-    QCOMPARE( sw->receivedOvershoot, false );
-
-    // -- try to scroll with overshoot (always on)
-    sw->reset();
-    sw->scrollArea = QRectF(0, 0, 0, 1000);
-
-    sp1.setScrollMetric(QScrollerProperties::HorizontalOvershootPolicy, QVariant::fromValue(QScrollerProperties::OvershootAlwaysOn));
-    s1->setScrollerProperties(sp1);
-    kineticScrollNoTest(sw, QPointF(0, 500), QPoint(0, 0), QPoint(400, 0), QPoint(490, 0));
-
-    while (s1->state() != QScroller::Inactive)
-        QTest::qWait(20);
-
-    //qDebug() << "Overshoot fuzzy: "<<sw->currentPos;
-
-    QVERIFY(qFuzzyCompare( sw->currentPos.x(), 0 ));
-    QVERIFY(qFuzzyCompare( sw->currentPos.y(), 500 ));
-    QCOMPARE( sw->receivedOvershoot, true );
-
-    // -- try to scroll with overshoot (always off)
-    sw->reset();
-    sw->scrollArea = QRectF(0, 0, 1000, 1000);
-
-    sp1.setScrollMetric(QScrollerProperties::HorizontalOvershootPolicy, QVariant::fromValue(QScrollerProperties::OvershootAlwaysOff));
-    s1->setScrollerProperties(sp1);
-    kineticScrollNoTest(sw, QPointF(500, 500), QPoint(0, 0), QPoint(400, 0), QPoint(490, 0));
-
-    while (s1->state() != QScroller::Inactive)
-        QTest::qWait(20);
-
-    QVERIFY(qFuzzyCompare( sw->currentPos.x(), 0 ));
-    QVERIFY(qFuzzyCompare( sw->currentPos.y(), 500 ));
-    QCOMPARE( sw->receivedOvershoot, false );
-
-    // -- try to scroll with overshoot (always on but max overshoot = 0)
-    sp1.setScrollMetric(QScrollerProperties::OvershootDragDistanceFactor, 0.0);
-    sp1.setScrollMetric(QScrollerProperties::OvershootScrollDistanceFactor, 0.0);
-    sw->reset();
-    sw->scrollArea = QRectF(0, 0, 1000, 1000);
-
-    sp1.setScrollMetric(QScrollerProperties::HorizontalOvershootPolicy, QVariant::fromValue(QScrollerProperties::OvershootAlwaysOn));
-    s1->setScrollerProperties(sp1);
-    kineticScrollNoTest(sw, QPointF(500, 500), QPoint(0, 0), QPoint(400, 0), QPoint(490, 0));
-
-    while (s1->state() != QScroller::Inactive)
-        QTest::qWait(20);
-
-    QVERIFY(qFuzzyCompare( sw->currentPos.x(), 0 ));
-    QVERIFY(qFuzzyCompare( sw->currentPos.y(), 500 ));
-    QCOMPARE( sw->receivedOvershoot, false );
-
-
-    delete sw;
-#endif
-}
-
-
-QTEST_MAIN(tst_QScroller)
-
-#include "tst_qscroller.moc"
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index b508d47..786899e 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -156,6 +156,7 @@ private slots:
     void setSslConfiguration_data();
     void setSslConfiguration();
     void waitForEncrypted();
+    void waitForEncryptedMinusOne();
     void waitForConnectedEncryptedReadyRead();
     void startClientEncryption();
     void startServerEncryption();
@@ -1098,6 +1099,20 @@ void tst_QSslSocket::waitForEncrypted()
     QVERIFY(socket->waitForEncrypted(10000));
 }
 
+void tst_QSslSocket::waitForEncryptedMinusOne()
+{
+    if (!QSslSocket::supportsSsl())
+        return;
+
+    QSslSocketPtr socket = newSocket();
+    this->socket = socket;
+
+    connect(socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(ignoreErrorSlot()));
+    socket->connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
+
+    QVERIFY(socket->waitForEncrypted(-1));
+}
+
 void tst_QSslSocket::waitForConnectedEncryptedReadyRead()
 {
     if (!QSslSocket::supportsSsl())
diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index f83c4cf..d19475f 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -166,7 +166,9 @@ private slots:
     void readLineString();
     void readChunks();
     void waitForBytesWritten();
+    void waitForBytesWrittenMinusOne();
     void waitForReadyRead();
+    void waitForReadyReadMinusOne();
     void flush();
     void synchronousApi();
     void dontCloseOnTimeout();
@@ -1417,10 +1419,10 @@ void tst_QTcpSocket::readChunks()
 void tst_QTcpSocket::waitForBytesWritten()
 {
     QTcpSocket *socket = newSocket();
-    socket->connectToHost(QtNetworkSettings::serverName(), 22);
+    socket->connectToHost(QtNetworkSettings::serverName(), 80);
     QVERIFY(socket->waitForConnected(10000));
 
-    socket->write(QByteArray(10000, '@'));
+    socket->write("GET / HTTP/1.0\r\n\r\n");
     qint64 toWrite = socket->bytesToWrite();
     QVERIFY(socket->waitForBytesWritten(5000));
     QVERIFY(toWrite > socket->bytesToWrite());
@@ -1429,11 +1431,37 @@ void tst_QTcpSocket::waitForBytesWritten()
 }
 
 //----------------------------------------------------------------------------------
+void tst_QTcpSocket::waitForBytesWrittenMinusOne()
+{
+    QTcpSocket *socket = newSocket();
+    socket->connectToHost(QtNetworkSettings::serverName(), 80);
+    QVERIFY(socket->waitForConnected(10000));
+
+    socket->write("GET / HTTP/1.0\r\n\r\n");
+    qint64 toWrite = socket->bytesToWrite();
+    QVERIFY(socket->waitForBytesWritten(-1));
+    QVERIFY(toWrite > socket->bytesToWrite());
+
+    delete socket;
+}
+
+//----------------------------------------------------------------------------------
 void tst_QTcpSocket::waitForReadyRead()
 {
     QTcpSocket *socket = newSocket();
-    socket->connectToHost(QtNetworkSettings::serverName(), 22);
-    socket->waitForReadyRead(0);
+    socket->connectToHost(QtNetworkSettings::serverName(), 80);
+    socket->write("GET / HTTP/1.0\r\n\r\n");
+    QVERIFY(socket->waitForReadyRead(5000));
+    delete socket;
+}
+
+//----------------------------------------------------------------------------------
+void tst_QTcpSocket::waitForReadyReadMinusOne()
+{
+    QTcpSocket *socket = newSocket();
+    socket->connectToHost(QtNetworkSettings::serverName(), 80);
+    socket->write("GET / HTTP/1.0\r\n\r\n");
+    QVERIFY(socket->waitForReadyRead(-1));
     delete socket;
 }