diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-20 14:55:10 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-20 14:55:10 (GMT) |
| commit | 101bcfd2ac0cb6d7fed6cd2e7a54012ff34afe70 (patch) | |
| tree | 3211aac1892ea0d7ec50ed8f5f3b1facdffac9ab /src/gui | |
| parent | 393db7ada80e803c73fa65f68f5dd037c16ed836 (diff) | |
| parent | af17ea048179ea0c21a897f803e79f825a9d13b6 (diff) | |
| download | Qt-101bcfd2ac0cb6d7fed6cd2e7a54012ff34afe70.zip Qt-101bcfd2ac0cb6d7fed6cd2e7a54012ff34afe70.tar.gz Qt-101bcfd2ac0cb6d7fed6cd2e7a54012ff34afe70.tar.bz2 | |
Merge branch 'qlayout-make_adjustSize_better' into 4.6
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index b7a96b0..c36c68a 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -7723,6 +7723,10 @@ void QWidget::adjustSize() Q_D(QWidget); ensurePolished(); QSize s = d->adjustedSize(); + + if (d->layout) + d->layout->activate(); + if (s.isValid()) resize(s); } |