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 /tests | |
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 'tests')
-rw-r--r-- | tests/auto/qcombobox/tst_qcombobox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp index 6984a88..e76f0f7 100644 --- a/tests/auto/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/qcombobox/tst_qcombobox.cpp @@ -746,7 +746,7 @@ void tst_QComboBox::virtualAutocompletion() // We need to set the keyboard input interval to a higher value // as the processEvent() call takes too much time, so it restarts // the keyboard search then -#if defined(QT_ARCH_ARM) || defined(QT_ARCH_MIPS) +#if defined(QT_ARCH_ARM) || defined(QT_ARCH_MIPS) || defined(QT_ARCH_SYMBIAN) int oldInterval = QApplication::keyboardInputInterval(); QApplication::setKeyboardInputInterval(1500); #endif @@ -782,7 +782,7 @@ void tst_QComboBox::virtualAutocompletion() QApplication::sendEvent(testWidget, &kr2); qApp->processEvents(); // Process events to trigger autocompletion QTRY_COMPARE(testWidget->currentIndex(), 3); -#if defined(QT_ARCH_ARM) || defined(QT_ARCH_MIPS) +#if defined(QT_ARCH_ARM) || defined(QT_ARCH_MIPS) || defined(QT_ARCH_SYMBIAN) QApplication::setKeyboardInputInterval(oldInterval); #endif } |