diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-10-06 12:51:58 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-10-06 12:51:58 (GMT) |
| commit | 27456087b6c032b48b3aca6ea228a3d068a6d7c9 (patch) | |
| tree | 6b2ccb894f93e290adf245e51dbbe89978493ce1 /tests/auto/qgraphicslinearlayout | |
| parent | 6bbe0f3105fb8ec70aeb0952bec671b72b9f5400 (diff) | |
| parent | a2b8c2b6b5c7de30a3b0d390c3d9885aabb98c57 (diff) | |
| download | Qt-27456087b6c032b48b3aca6ea228a3d068a6d7c9.zip Qt-27456087b6c032b48b3aca6ea228a3d068a6d7c9.tar.gz Qt-27456087b6c032b48b3aca6ea228a3d068a6d7c9.tar.bz2 | |
Merge commit 'origin/4.5' into 4.6
Conflicts:
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
Diffstat (limited to 'tests/auto/qgraphicslinearlayout')
| -rw-r--r-- | tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index 4e46819..4f28df4 100644 --- a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -1370,6 +1370,8 @@ void tst_QGraphicsLinearLayout::layoutDirection() QGraphicsWidget *window = new QGraphicsWidget(0, Qt::Window); QGraphicsLinearLayout *layout = new QGraphicsLinearLayout; layout->setContentsMargins(1, 2, 3, 4); + layout->setSpacing(6); + RectWidget *w1 = new RectWidget; w1->setPreferredSize(20, 20); w1->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); |