summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-15 10:22:42 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-15 10:22:42 (GMT)
commit77edce14629b665924e89b1f22f902ceb010c964 (patch)
treed941c19194a8a43cfa1b1064a4bea90364068220
parentf8c0b86e7c0f31f3dee100bb349f7c89380afb44 (diff)
parentd52e3d553664f0fe9a5313908eeb10104f539249 (diff)
downloadQt-77edce14629b665924e89b1f22f902ceb010c964.zip
Qt-77edce14629b665924e89b1f22f902ceb010c964.tar.gz
Qt-77edce14629b665924e89b1f22f902ceb010c964.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove test cases which cause stack overflow
-rw-r--r--tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp b/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp
index 8c30be4..7015bd1 100644
--- a/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp
@@ -159,12 +159,17 @@ void tst_QWidget::update_data()
QTest::newRow("10x10x1 opaque") << 10 << 10 << 1 << true;
QTest::newRow("10x10x10 opaque") << 10 << 10 << 10 << true;
QTest::newRow("10x10x100 opaque") << 10 << 10 << 100 << true;
+#ifndef Q_OS_SYMBIAN
+ //These test cases cause stack overflow in QWidgetPrivate::paintSiblingsRecursive
+ //see http://bugreports.qt.nokia.com/browse/QTBUG-8512
+ //Symbian threads have a hard limit of 80kB user stack
QTest::newRow("25x25x1 transparent ") << 25 << 25 << 1 << false;
QTest::newRow("25x25x10 transparent") << 25 << 25 << 10 << false;
QTest::newRow("25x25x100 transparent") << 25 << 25 << 100 << false;
QTest::newRow("25x25x1 opaque") << 25 << 25 << 1 << true;
QTest::newRow("25x25x10 opaque") << 25 << 25 << 10 << true;
QTest::newRow("25x25x100 opaque") << 25 << 25 << 100 << true;
+#endif
}
void tst_QWidget::update()