diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-04-06 22:47:32 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-04-06 22:47:32 (GMT) |
| commit | bccb7b178c0255c74d648c3972895f66a70fd87b (patch) | |
| tree | ead94cee89e2ffda4127201b734f1660f1389585 /src/gui/widgets/qdockarealayout.cpp | |
| parent | 423d6052844b2026c8acc8826d6546d3afc494d3 (diff) | |
| parent | cf42b485ebc1ab3e1f0a804b8c4e404fa99f1f6f (diff) | |
| download | Qt-bccb7b178c0255c74d648c3972895f66a70fd87b.zip Qt-bccb7b178c0255c74d648c3972895f66a70fd87b.tar.gz Qt-bccb7b178c0255c74d648c3972895f66a70fd87b.tar.bz2 | |
Merge branch 'master' into contiguouscache
Diffstat (limited to 'src/gui/widgets/qdockarealayout.cpp')
| -rw-r--r-- | src/gui/widgets/qdockarealayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qdockarealayout.cpp b/src/gui/widgets/qdockarealayout.cpp index 9261c63..4f0ec1e 100644 --- a/src/gui/widgets/qdockarealayout.cpp +++ b/src/gui/widgets/qdockarealayout.cpp @@ -579,7 +579,7 @@ void QDockAreaLayoutInfo::fitItems() QLayoutStruct &ls = layout_struct_list[j++]; ls.init(); ls.empty = false; - if (gap || (item.flags & QDockAreaLayoutItem::KeepSize)) { + if (item.flags & QDockAreaLayoutItem::KeepSize) { ls.minimumSize = ls.maximumSize = ls.sizeHint = item.size; ls.expansive = false; ls.stretch = 0; |