QMenuBar: honor the left widget size hint

expandedTo() returns the expanded size, so we must assign the
return value (otherwise it's a no op). We were accidentally
discarding it.

Task-number: QTBUG-36010
Change-Id: Ic70c12648382a6b2ef7d70809bf25caa4cbe2f3a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
bb10
Giuseppe D'Angelo 2015-05-14 12:06:16 +02:00
parent 9d85490ea2
commit 6779ec383d
1 changed files with 1 additions and 1 deletions

View File

@ -1632,7 +1632,7 @@ QSize QMenuBar::sizeHint() const
if(d->leftWidget) {
QSize sz = d->leftWidget->sizeHint();
sz.rheight() += margin;
ret.expandedTo(sz);
ret = ret.expandedTo(sz);
}
if(d->rightWidget) {
QSize sz = d->rightWidget->sizeHint();