diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-09 12:04:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-09 12:04:29 (GMT) |
| commit | 17663e34acab66a06a7a1c13e41afbd02195edc9 (patch) | |
| tree | b364851d22069705920afea33442709f9d825311 /src/gui/widgets/qcombobox.cpp | |
| parent | 098c952dac34ff2a82e07ccf54056f74f9208ba5 (diff) | |
| parent | 46e1644028a75b9f8f13945915b350b3d3ece070 (diff) | |
| download | Qt-17663e34acab66a06a7a1c13e41afbd02195edc9.zip Qt-17663e34acab66a06a7a1c13e41afbd02195edc9.tar.gz Qt-17663e34acab66a06a7a1c13e41afbd02195edc9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Editable QComboBox popup immediately closes itself after a click
Change RLibrary handle in QS60PluginResolver to be process wide
Cursor is misplaced in the editors text area
QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
Diffstat (limited to 'src/gui/widgets/qcombobox.cpp')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index 917a325..96d2acd 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -2849,7 +2849,8 @@ void QComboBox::mousePressEvent(QMouseEvent *e) if (sc == QStyle::SC_ComboBoxArrow) d->updateArrow(QStyle::State_Sunken); #ifdef QT_KEYPAD_NAVIGATION - if (!d->lineEdit) { + //if the container already exists, then d->viewContainer() is safe to call + if (d->container) { #endif // We've restricted the next couple of lines, because by not calling // viewContainer(), we avoid creating the QComboBoxPrivateContainer. |