Merge remote-tracking branch 'qt/4.8'

Conflicts:
	doc/src/examples/wheel.qdoc
	src/gui/util/qflickgesture.cpp
	src/gui/util/qflickgesture_p.h
	src/gui/util/qscroller.cpp
	src/gui/util/qscroller.h
	src/gui/util/qscroller_p.h
	src/gui/util/qscrollerproperties.cpp
	src/gui/util/qscrollerproperties.h
	tests/auto/qscroller/tst_qscroller.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/qsplitter/tst_qsplitter.cpp b/tests/auto/qsplitter/tst_qsplitter.cpp
index a72973d..473018d 100644
--- a/tests/auto/qsplitter/tst_qsplitter.cpp
+++ b/tests/auto/qsplitter/tst_qsplitter.cpp
@@ -1340,14 +1340,14 @@ void tst_QSplitter::task187373_addAbstractScrollAreas()
     QFETCH(QString, className);
     QFETCH(bool, addInConstructor);
     QFETCH(bool, addOutsideConstructor);
-    Q_ASSERT(addInConstructor || addOutsideConstructor);
+    QVERIFY(addInConstructor || addOutsideConstructor);
 
     QSplitter *splitter = new QSplitter;
     splitter->show();
-    Q_ASSERT(splitter->isVisible());
+    QVERIFY(splitter->isVisible());
 
     QAbstractScrollArea *w = task187373_createScrollArea(splitter, className, addInConstructor);
-    Q_ASSERT(w);
+    QVERIFY(w);
     if (addOutsideConstructor)
         splitter->addWidget(w);