summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan-Arve Saether <jan-arve.saether@nokia.com>2011-01-19 20:55:06 (GMT)
committerJan-Arve Saether <jan-arve.saether@nokia.com>2011-01-19 20:55:06 (GMT)
commit43f8762367fa6ffc228ae6e97192766475b02ac0 (patch)
tree39a9e484ff3eaaa89f8ab52101ae9551bc189f2a /src
parentfc2b2b3fdb2fb2ee9e632a0c3df4f783b26397f8 (diff)
downloadQt-43f8762367fa6ffc228ae6e97192766475b02ac0.zip
Qt-43f8762367fa6ffc228ae6e97192766475b02ac0.tar.gz
Qt-43f8762367fa6ffc228ae6e97192766475b02ac0.tar.bz2
Enable the widthForHeight() test case.
While I did that I also found a copy-paste (?) bug in the WFH case of QGridLayoutEngine::sizeHint() that caused the widthForHeight() case to fail. Task-number: QTBUG-14693
Diffstat (limited to 'src')
-rw-r--r--src/gui/graphicsview/qgridlayoutengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp
index 75f1cf5..23cae94 100644
--- a/src/gui/graphicsview/qgridlayoutengine.cpp
+++ b/src/gui/graphicsview/qgridlayoutengine.cpp
@@ -1174,7 +1174,7 @@ QSizeF QGridLayoutEngine::sizeHint(const QLayoutStyleInfo &styleInfo, Qt::SizeHi
//constraints to find the column widths
q_rowData.calculateGeometries(0, rowCount(), height, sizehint_yy.data(), sizehint_heights.data(),
0, sizehint_totalBoxes[Ver], q_infos[Ver]);
- ensureColumnAndRowData(&q_columnData, &sizehint_totalBoxes[Hor], styleInfo, sizehint_yy.data(), sizehint_heights.data(), Qt::Vertical);
+ ensureColumnAndRowData(&q_columnData, &sizehint_totalBoxes[Hor], styleInfo, sizehint_yy.data(), sizehint_heights.data(), Qt::Horizontal);
sizeHintCalculated = true;
}
}