diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-09 13:03:54 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-09 13:03:54 +0200 |
| commit | 8bc84e2180e1d5819b372f4cd8c236b853145803 (patch) | |
| tree | 6c5e6a8b6a1750e2484fd34f48be662fcf51959f /tests/auto/qlistwidget | |
| parent | d641198fa71fadd243e84dfdf02b9a0536a27b3f (diff) | |
| parent | 3b1e30bb1d6651a626aba1f6b8883f5524598ed3 (diff) | |
Merge commit 'origin/master' into 4.6-merged
Conflicts:
src/corelib/kernel/qcoreevent.cpp
src/corelib/tools/qdumper.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_s60.cpp
src/gui/text/qfontdatabase.cpp
src/network/access/qnetworkreplyimpl.cpp
src/sql/drivers/ibase/qsql_ibase.cpp
src/testlib/qtestcase.cpp
src/testlib/testlib.pro
tests/auto/network-settings.h
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qobjectrace/tst_qobjectrace.cpp
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
tools/configure/configureapp.cpp
translations/qt_ru.ts
Diffstat (limited to 'tests/auto/qlistwidget')
| -rw-r--r-- | tests/auto/qlistwidget/tst_qlistwidget.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp index e581bd3acc..6f49a37749 100644 --- a/tests/auto/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp @@ -1435,6 +1435,10 @@ public: void tst_QListWidget::fastScroll() { + if (qstrcmp(QApplication::style()->metaObject()->className(), "QS60Style") == 0) { + QSKIP("S60 style doesn't support fast scrolling", SkipAll); + } + MyListWidget widget; for (int i = 0; i < 50; ++i) widget.addItem(QString("Item %1").arg(i)); |