diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-10-06 23:56:02 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-10-06 23:56:02 (GMT) |
commit | b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7 (patch) | |
tree | ac169cc9df2ff639e81b15dcaf268ed09d2e16cb /src/gui/kernel/qformlayout.cpp | |
parent | 5584feca163e91588f08b0aa1f3ae2817cd90823 (diff) | |
parent | d7fe798e022884dcbc58844e686a7d4fd39cf027 (diff) | |
download | Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.zip Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.tar.gz Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/kernel/qformlayout.cpp')
-rw-r--r-- | src/gui/kernel/qformlayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qformlayout.cpp b/src/gui/kernel/qformlayout.cpp index 6ceab07..3e5dadc 100644 --- a/src/gui/kernel/qformlayout.cpp +++ b/src/gui/kernel/qformlayout.cpp @@ -252,7 +252,7 @@ QFormLayoutPrivate::QFormLayoutPrivate() : fieldGrowthPolicy(DefaultFieldGrowthPolicy), rowWrapPolicy(DefaultRowWrapPolicy), has_hfw(false), dirty(true), sizesDirty(true), expandVertical(0), expandHorizontal(0), labelAlignment(0), formAlignment(0), - hfw_width(-1), hfw_sh_height(-1), min_width(-1), + layoutWidth(-1), hfw_width(-1), hfw_sh_height(-1), min_width(-1), sh_width(-1), thresh_width(QLAYOUTSIZE_MAX), hSpacing(-1), vSpacing(-1) { } |