diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-09 23:00:18 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-09 23:00:18 (GMT) |
| commit | 7b14625eb9a85406e7851fa1c37c3bfa2acec3cc (patch) | |
| tree | 829db882717162d73e06451855032c87e16bc41c /tests | |
| parent | 0870d766b9e302081ba31a9c8f6dfa3a1e8c1e52 (diff) | |
| parent | 894e3c41af88a0bbfa2fc63fe3872ed27ab7a3dc (diff) | |
| download | Qt-7b14625eb9a85406e7851fa1c37c3bfa2acec3cc.zip Qt-7b14625eb9a85406e7851fa1c37c3bfa2acec3cc.tar.gz Qt-7b14625eb9a85406e7851fa1c37c3bfa2acec3cc.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'tests')
| -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) { |