diff options
| author | Denis Oliver Kropp <dok@directfb.org> | 2011-04-18 10:24:31 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-04-18 10:25:45 (GMT) |
| commit | 41c3b83ff68d2a58f5fda462907bbf0f8c63effc (patch) | |
| tree | 2717a0a159eeb368a9e13b73309c402227986566 /src/gui | |
| parent | cec6c3ad52f6b4cdf04b70340ff7d15ebd8c7d26 (diff) | |
| download | Qt-41c3b83ff68d2a58f5fda462907bbf0f8c63effc.zip Qt-41c3b83ff68d2a58f5fda462907bbf0f8c63effc.tar.gz Qt-41c3b83ff68d2a58f5fda462907bbf0f8c63effc.tar.bz2 | |
Fix build of Qt/DirectFB without graphics view support.
Merge-request: 1187
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/gui')
| -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 4b087e9..04ab801 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -704,11 +704,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) |