diff options
| author | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2009-09-30 08:37:58 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2009-09-30 08:44:16 (GMT) |
| commit | 6889622da4d17e5cd97e483deb780d83e3bb4548 (patch) | |
| tree | c851e8ef747553f1e5fa7daebd81e632ef9f0b59 /src/gui/widgets/qcombobox.cpp | |
| parent | 2dd684b0342be3ddc1c16defef0aa1dc76d82890 (diff) | |
| download | Qt-6889622da4d17e5cd97e483deb780d83e3bb4548.zip Qt-6889622da4d17e5cd97e483deb780d83e3bb4548.tar.gz Qt-6889622da4d17e5cd97e483deb780d83e3bb4548.tar.bz2 | |
Symbian specific fixes to QComboBox
Fixes QComboBox edit field geometry in s60style
Fixes softkey crash when setting a custom itemview to QComboBox
Fixes Symbian keyboard input interval in tst_QComboBox::virtualAutocompletion()
Reviewed-by: Sami Merila
Diffstat (limited to 'src/gui/widgets/qcombobox.cpp')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index 61532b9..95ff4c1 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -403,8 +403,8 @@ QComboBoxPrivateContainer::QComboBoxPrivateContainer(QAbstractItemView *itemView layout->setMargin(0); #ifdef QT_SOFTKEYS_ENABLED - selectAction = QSoftKeyManager::createKeyedAction(QSoftKeyManager::SelectSoftKey, Qt::Key_Select, itemView); - cancelAction = QSoftKeyManager::createKeyedAction(QSoftKeyManager::CancelSoftKey, Qt::Key_Escape, itemView); + selectAction = QSoftKeyManager::createKeyedAction(QSoftKeyManager::SelectSoftKey, Qt::Key_Select, this); + cancelAction = QSoftKeyManager::createKeyedAction(QSoftKeyManager::CancelSoftKey, Qt::Key_Escape, this); addAction(selectAction); addAction(cancelAction); #endif @@ -534,6 +534,7 @@ void QComboBoxPrivateContainer::setItemView(QAbstractItemView *itemView) this, SLOT(setCurrentIndex(QModelIndex))); disconnect(view, SIGNAL(destroyed()), this, SLOT(viewDestroyed())); + delete view; view = 0; } @@ -571,11 +572,6 @@ void QComboBoxPrivateContainer::setItemView(QAbstractItemView *itemView) this, SLOT(setCurrentIndex(QModelIndex))); connect(view, SIGNAL(destroyed()), this, SLOT(viewDestroyed())); - -#ifdef QT_SOFTKEYS_ENABLED - selectAction->setParent(itemView); - cancelAction->setParent(itemView); -#endif } /*! |