diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-20 10:47:02 +0100 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-20 10:47:02 +0100 |
| commit | 10c90522d6e3807baac3c4bfca4eedc51a4251f5 (patch) | |
| tree | 92005b547e3b92eb9e640fae8c78fdcdc13b6dd9 /tests/auto/qprocess | |
| parent | 64e1f888586f2c988b08bcc93579990e970b7206 (diff) | |
| parent | 97b039438bc31bb420138d72549372adb1244dc8 (diff) | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/plugins/phonon/mmf/mmf.pro
src/s60installs/s60installs.pro
tests/auto/qapplication/test/test.pro
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
Diffstat (limited to 'tests/auto/qprocess')
| -rw-r--r-- | tests/auto/qprocess/tst_qprocess.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp index a497b1301a..9c4d134e38 100644 --- a/tests/auto/qprocess/tst_qprocess.cpp +++ b/tests/auto/qprocess/tst_qprocess.cpp @@ -2002,11 +2002,15 @@ void tst_QProcess::spaceInName() void tst_QProcess::lockupsInStartDetached() { #if !defined(Q_OS_SYMBIAN) - // What exactly is this call supposed to achieve anyway? + // Check that QProcess doesn't cause a lock up at this program's + // exit if a thread was started and we tried to run a program that + // doesn't exist. Before Qt 4.2, this used to lock up on Unix due + // to calling ::exit instead of ::_exit if execve failed. + QHostInfo::lookupHost(QString("something.invalid"), 0, 0); -#endif QProcess::execute("yjhbrty"); QProcess::startDetached("yjhbrty"); +#endif } //----------------------------------------------------------------------------- |