diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-06-01 22:55:19 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-06-01 22:55:19 (GMT) |
| commit | 0548b4f69d95dbd992cf60c8ab0f1225523b15e1 (patch) | |
| tree | a3669b4d755cc1721681e424513ec7801146b2b3 /tests/auto/qgraphicsitem | |
| parent | 73fc68802d8c0c8d3d499b279782ce270f1c5bc6 (diff) | |
| parent | e9ab8493053a7dd56cde058e736f46feafb378d0 (diff) | |
| download | Qt-0548b4f69d95dbd992cf60c8ab0f1225523b15e1.zip Qt-0548b4f69d95dbd992cf60c8ab0f1225523b15e1.tar.gz Qt-0548b4f69d95dbd992cf60c8ab0f1225523b15e1.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.8-from-4.7
Conflicts:
src/declarative/declarative.pro
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
Diffstat (limited to 'tests/auto/qgraphicsitem')
| -rw-r--r-- | tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 9b7b228..4bcd19b 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -8029,7 +8029,16 @@ void tst_QGraphicsItem::sorting() QGraphicsView view(&scene); view.setResizeAnchor(QGraphicsView::NoAnchor); view.setTransformationAnchor(QGraphicsView::NoAnchor); +#ifdef Q_OS_SYMBIAN + // Adjust area in devices where scrollbars are thicker than 25 pixels as they will + // obstruct painting otherwise. + int scrollWidth = qMax(25, view.verticalScrollBar()->width()); + int scrollHeight = qMax(25, view.horizontalScrollBar()->height()); + + view.resize(95 + scrollWidth, 75 + scrollHeight); +#else view.resize(120, 100); +#endif view.setFrameStyle(0); view.show(); #ifdef Q_WS_X11 |