diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-01 11:02:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-01 11:02:03 (GMT) |
| commit | bda164303570629e44185e8baa52908ced6da301 (patch) | |
| tree | a5ace3f53bbdcdb4bdbee21d916dea2135c6de82 /src/gui/widgets | |
| parent | 0b2c731a66ccfed7dc5283ae52b8c6b7adc317f3 (diff) | |
| parent | e9ac791e2afce05be68da5f7b0c00eac00811f29 (diff) | |
| download | Qt-bda164303570629e44185e8baa52908ced6da301.zip Qt-bda164303570629e44185e8baa52908ced6da301.tar.gz Qt-bda164303570629e44185e8baa52908ced6da301.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed the combobox just adjusting their size without relayouting
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index 213ca95..fe00173 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(); } |