diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 10:37:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 10:37:40 (GMT) |
| commit | 47760d59d57f548d5816ae43e456c86e01146491 (patch) | |
| tree | 059cc6290eabbd25ade0d3d8e40e2bc00ede5a79 /tests/benchmarks/gui | |
| parent | b4c589868f278aa9a58ab9afa727dbf0a9442e22 (diff) | |
| parent | a81cc0add7f9517dfbd31bb9988ab6bdc08c2b96 (diff) | |
| download | Qt-47760d59d57f548d5816ae43e456c86e01146491.zip Qt-47760d59d57f548d5816ae43e456c86e01146491.tar.gz Qt-47760d59d57f548d5816ae43e456c86e01146491.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (24 commits)
Provide a way to specify the final sis name with createpackage/make sis
Update DEF files for Qt 4.7
Symbian/trk: Fix debugging output for the N8.
Add license header
Fix slider stepping when used with keypad navigation
fix webkit crash when accessing network on Symbian
Remove test cases which cause stack overflow
Fix compile errors
Run autotests with minimal capabilities
Documentation updates for Qt/Symbian on Linux development
Allow EPOCROOT env var to be without trailing slash.
Workaround for Symbian Open C bug in socket connect.
Fix fetchedRoot test variable to work also in Symbian
Add configure time checks for symbian environment
Check for existance of sis file parameter to runonphone
Fix thread synchronization issues in Symbian QFileSystemWatcher
Disable compiling of the plugin when extra package not found
Added missing UID3 for qsymbianbearer.dll.
Enabled previously disabled Qt features.
Fix includes so it compiles
...
Diffstat (limited to 'tests/benchmarks/gui')
| -rw-r--r-- | tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp | 5 |
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() |