summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-07-01 10:48:00 (GMT)
committerQt Commercial Integration <QtCommercial@digia.com>2012-01-31 10:25:03 (GMT)
commit4ea25071a909c1ac6d69930af2575774d4e9127e (patch)
treee6c9e34d2a25367d7f4df22c4f6cc4e8121410bc
parentfd8df6ad5640cbdb4f4d24b8dcd72e14b063cc76 (diff)
downloadQt-4ea25071a909c1ac6d69930af2575774d4e9127e.zip
Qt-4ea25071a909c1ac6d69930af2575774d4e9127e.tar.gz
Qt-4ea25071a909c1ac6d69930af2575774d4e9127e.tar.bz2
Fixed the combobox just adjusting their size without relayouting
When adjustSize() is called, we nned to call updateGeometry to notify the layout in which the combobox is to redo the layout. Task-number: QTBUG-2559
-rw-r--r--src/gui/widgets/qcombobox.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp
index 8f2cbff..d108c86 100644
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
@@ -369,6 +369,7 @@ void QComboBoxPrivateContainer::timerEvent(QTimerEvent *timerEvent)
if (timerEvent->timerId() == adjustSizeTimer.timerId()) {
adjustSizeTimer.stop();
if (combo->sizeAdjustPolicy() == QComboBox::AdjustToContents) {
+ combo->updateGeometry();
combo->adjustSize();
combo->update();
}