diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-07-01 08:07:14 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-07-01 08:07:52 (GMT) |
| commit | cb2b4a12ac17adf56074d3630efe4feb50ae0e2b (patch) | |
| tree | eaa4335e45699cbb698f42a43712039bd63ccf7c /src/gui/widgets | |
| parent | 30ef2af599f85fef56b975f45fd4edfe817a449a (diff) | |
| parent | d3ae6c620876e08ed130606709c208f7352b2f81 (diff) | |
| download | Qt-cb2b4a12ac17adf56074d3630efe4feb50ae0e2b.zip Qt-cb2b4a12ac17adf56074d3630efe4feb50ae0e2b.tar.gz Qt-cb2b4a12ac17adf56074d3630efe4feb50ae0e2b.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index 1504066..dcc328f 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -704,6 +704,11 @@ void QComboBoxPrivateContainer::hideEvent(QHideEvent *) { emit resetButton(); combo->update(); + // QGraphicsScenePrivate::removePopup closes the combo box popup, it hides it non-explicitly. + // Hiding/showing the QComboBox after this will unexpectedly show the popup as well. + // Re-hiding the popup container makes sure it is explicitly hidden. + if (QGraphicsProxyWidget *proxy = graphicsProxyWidget()) + proxy->hide(); } void QComboBoxPrivateContainer::mousePressEvent(QMouseEvent *e) |