summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2010-11-19 10:53:26 (GMT)
committerSami Merila <sami.merila@nokia.com>2010-11-19 10:53:26 (GMT)
commit2530a8b70da9b172ccd041a347f2556c3140c147 (patch)
treee2e4c3d593c495152a132365dfbad478b1d1a97d
parentbecc25ad78a89199764a54f45248e4113600f0af (diff)
parent7b0e00bb59a9bbff2f1114760ab4b0a86460d055 (diff)
downloadQt-2530a8b70da9b172ccd041a347f2556c3140c147.zip
Qt-2530a8b70da9b172ccd041a347f2556c3140c147.tar.gz
Qt-2530a8b70da9b172ccd041a347f2556c3140c147.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
-rw-r--r--tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index 0dd9543..dc415fb 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -93,7 +93,7 @@ void tst_QGraphicsLinearLayout::heightForWidth()
QGraphicsLinearLayout *outerlayout = 0;
if (nested) {
outerlayout = new QGraphicsLinearLayout(form);
- for(int i = 0; i < 8; i++) {
+ for (int i = 0; i < 8; i++) {
QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical);
outerlayout->addItem(layout);
outerlayout = layout;