diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2009-12-22 16:14:59 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2010-01-04 14:49:52 (GMT) |
| commit | 0e94349de0b602f1b6af747b66ef03b22133cc3a (patch) | |
| tree | bddd755f649be409c2af2fda9f4ffa8f32d18afc /qmake | |
| parent | 44f7b73940c67b8e81f52dfc6370453ff07d3aa2 (diff) | |
| download | Qt-0e94349de0b602f1b6af747b66ef03b22133cc3a.zip Qt-0e94349de0b602f1b6af747b66ef03b22133cc3a.tar.gz Qt-0e94349de0b602f1b6af747b66ef03b22133cc3a.tar.bz2 | |
Deal with test cases that crash or hang
Added an optional timeout to runonphone - the application will be killed
after this time. Used when autotesting unattended, as some tests can hang.
Handled the just in time debug halting the application when it is about
to crash, by terminating the application. In future, we could capture a
call stack or something here.
Also added quiet/verbose options to control the amount of output from
runonphone.
Reviewed-by: Janne Koskinen
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/symbian/symmake.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index ddda848..f3339af 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -1866,7 +1866,7 @@ void SymbianMakefileGenerator::generateExecutionTargets(QTextStream& t, const QS t << "else" << endl; } t << "run: sis" << endl; - t << "\trunonphone --sis " << fixedTarget << "_$(QT_SIS_TARGET).sis " << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl; + t << "\trunonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis " << fixedTarget << "_$(QT_SIS_TARGET).sis " << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl; if (platforms.contains("winscw")) { t << "endif" << endl; } |