diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2009-09-15 23:45:32 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2009-09-15 23:45:32 (GMT) |
commit | 4e2163a5c4eec9eeacf8c7260dbf8fb7c74d2b44 (patch) | |
tree | 31d86c91c526563302887e756ce5f7876f274223 /tests/auto/qprocess/tst_qprocess.cpp | |
parent | adfb5c6160b37a917f20b301366567c208ae52a0 (diff) | |
parent | dcd4b15595a63864ee59a19d80f1ba33b4821aa3 (diff) | |
download | Qt-4e2163a5c4eec9eeacf8c7260dbf8fb7c74d2b44.zip Qt-4e2163a5c4eec9eeacf8c7260dbf8fb7c74d2b44.tar.gz Qt-4e2163a5c4eec9eeacf8c7260dbf8fb7c74d2b44.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qprocess/tst_qprocess.cpp')
-rw-r--r-- | tests/auto/qprocess/tst_qprocess.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp index 0291f66..cff6487 100644 --- a/tests/auto/qprocess/tst_qprocess.cpp +++ b/tests/auto/qprocess/tst_qprocess.cpp @@ -1164,7 +1164,7 @@ void tst_QProcess::softExitInSlots() SoftExitProcess proc(i); proc.start(appName); proc.write("OLEBOLE", 8); // include the \0 - QTestEventLoop::instance().enterLoop(1); + QTestEventLoop::instance().enterLoop(10); QCOMPARE(proc.state(), QProcess::NotRunning); QVERIFY(proc.waitedForFinished); } |