diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 14:25:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 14:25:50 (GMT) |
| commit | 45e3b274cbdfaa46c6e4f17e1635fba6b5e97e26 (patch) | |
| tree | c54a43b3b1141c252e681e79ec9f8cbf4512c554 /tests/auto | |
| parent | 60b09b8915e2095b221eb0a16a76d49e5bb10391 (diff) | |
| parent | 500f0dae6cab6d2bf48bcede64bba20d88578aa9 (diff) | |
| download | Qt-45e3b274cbdfaa46c6e4f17e1635fba6b5e97e26.zip Qt-45e3b274cbdfaa46c6e4f17e1635fba6b5e97e26.tar.gz Qt-45e3b274cbdfaa46c6e4f17e1635fba6b5e97e26.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:
Fixed test after the fix to QT-4077.
Fixed event starvation with pointer events on Symbian.
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qinputcontext/tst_qinputcontext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qinputcontext/tst_qinputcontext.cpp b/tests/auto/qinputcontext/tst_qinputcontext.cpp index 7811a53..5a258a9 100644 --- a/tests/auto/qinputcontext/tst_qinputcontext.cpp +++ b/tests/auto/qinputcontext/tst_qinputcontext.cpp @@ -158,8 +158,8 @@ public: } // For some reason, the test fails if using processEvents instead of an event loop - // with a zero timer to quit it, so use the timer. -#define KEY_WAIT 0 + // with a timer to quit it, so use the timer. +#define KEY_WAIT 10 void replay(QWidget *w) { |