diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-30 22:12:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-30 22:12:26 (GMT) |
| commit | d3ae6c620876e08ed130606709c208f7352b2f81 (patch) | |
| tree | 80162b139e7cbbed428b7391971199076a9454ab /src/gui/widgets | |
| parent | 2a79ec7e2223257dd35fbdfd3c92d95c599a115e (diff) | |
| parent | ec50421c7c592b2365a1f3d4c3dd251b145681e7 (diff) | |
| download | Qt-d3ae6c620876e08ed130606709c208f7352b2f81.zip Qt-d3ae6c620876e08ed130606709c208f7352b2f81.tar.gz Qt-d3ae6c620876e08ed130606709c208f7352b2f81.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Reformat whitespace according to coding style
QGraphicsView: Handle wheelEvents correctly with Qt::Popup widgets.
QGraphicsProxyWidget: Fixes QComboBox popup closing issue.
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) |