diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-01-07 14:45:56 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-01-07 14:45:56 (GMT) |
| commit | ce5f772c529517c3e1c043fd826a790316ed9915 (patch) | |
| tree | 159d306fedb648d659ecd6bc90c93225d1d2e6e1 /src/gui/kernel/qboxlayout.cpp | |
| parent | a628b5579a977594cf125110589c8bd5096db380 (diff) | |
| parent | 55c983e33d974d046d8deab8b68b85efdb9eb03a (diff) | |
| download | Qt-ce5f772c529517c3e1c043fd826a790316ed9915.zip Qt-ce5f772c529517c3e1c043fd826a790316ed9915.tar.gz Qt-ce5f772c529517c3e1c043fd826a790316ed9915.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/kernel/qboxlayout.cpp')
| -rw-r--r-- | src/gui/kernel/qboxlayout.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/kernel/qboxlayout.cpp b/src/gui/kernel/qboxlayout.cpp index d965933..37ec88d 100644 --- a/src/gui/kernel/qboxlayout.cpp +++ b/src/gui/kernel/qboxlayout.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -830,9 +830,11 @@ void QBoxLayout::setGeometry(const QRect &r) if (d->hasHfw && !horz(d->dir)) { for (int i = 0; i < n; i++) { QBoxLayoutItem *box = d->list.at(i); - if (box->item->hasHeightForWidth()) + if (box->item->hasHeightForWidth()) { + int width = qBound(box->item->minimumSize().width(), s.width(), box->item->maximumSize().width()); a[i].sizeHint = a[i].minimumSize = - box->item->heightForWidth(s.width()); + box->item->heightForWidth(width); + } } } |