diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-10-06 14:51:58 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-10-06 14:51:58 +0200 |
| commit | 27456087b6c032b48b3aca6ea228a3d068a6d7c9 (patch) | |
| tree | 6b2ccb894f93e290adf245e51dbbe89978493ce1 /tests/auto/qgraphicsview | |
| parent | 6bbe0f3105fb8ec70aeb0952bec671b72b9f5400 (diff) | |
| parent | a2b8c2b6b5c7de30a3b0d390c3d9885aabb98c57 (diff) | |
Merge commit 'origin/4.5' into 4.6
Conflicts:
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
Diffstat (limited to 'tests/auto/qgraphicsview')
| -rw-r--r-- | tests/auto/qgraphicsview/tst_qgraphicsview.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index 921f7f875b..df3ebef579 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -2977,6 +2977,7 @@ void tst_QGraphicsView::task245469_itemsAtPointWithClip() parent->setFlag(QGraphicsItem::ItemClipsChildrenToShape); QGraphicsView view(&scene); + view.resize(150,150); view.rotate(90); view.show(); QTest::qWaitForWindowShown(&view); |