diff options
author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2011-03-21 14:13:16 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-21 14:13:16 (GMT) |
commit | 84a342eea111f0a1da8fd0c417362aae2b851e56 (patch) | |
tree | 9ca77440d6503412408b5111d293dea088b8ffda /src/gui/widgets/qcombobox.cpp | |
parent | 55650943492ff00d086bc76039212ce8438ee203 (diff) | |
download | Qt-84a342eea111f0a1da8fd0c417362aae2b851e56.zip Qt-84a342eea111f0a1da8fd0c417362aae2b851e56.tar.gz Qt-84a342eea111f0a1da8fd0c417362aae2b851e56.tar.bz2 |
Fix compilation with QT_NO_
Merge-request: 1132
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/gui/widgets/qcombobox.cpp')
-rw-r--r-- | src/gui/widgets/qcombobox.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index b5dda5a..d63ccfb 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -705,11 +705,13 @@ void QComboBoxPrivateContainer::hideEvent(QHideEvent *) { emit resetButton(); combo->update(); +#ifndef QT_NO_GRAPHICSVIEW // 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(); +#endif } void QComboBoxPrivateContainer::mousePressEvent(QMouseEvent *e) |