diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-09 01:26:00 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-09 01:26:00 (GMT) |
| commit | dda314e206162215e60dd306b6347a04f19ca5df (patch) | |
| tree | e50652d9b6b72ccbd5622d1bf28feec34fc3a998 /tools | |
| parent | 8e56f62a7155ec8f8e8af07100675fd6185bf481 (diff) | |
| parent | d131a9f99ebd5d753d2eedfafe0b276410168bc8 (diff) | |
| download | Qt-dda314e206162215e60dd306b6347a04f19ca5df.zip Qt-dda314e206162215e60dd306b6347a04f19ca5df.tar.gz Qt-dda314e206162215e60dd306b6347a04f19ca5df.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlviewer/qfxtester.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/qmlviewer/qfxtester.cpp b/tools/qmlviewer/qfxtester.cpp index 8005b0e..0ccc9c0 100644 --- a/tools/qmlviewer/qfxtester.cpp +++ b/tools/qmlviewer/qfxtester.cpp @@ -118,12 +118,14 @@ void QFxTester::imagefailure() void QFxTester::complete() { + if (options & QmlViewer::ExitOnComplete) + QApplication::exit(hasFailed?-1:0); + if (hasCompleted) return; hasCompleted = true; - if (options & QmlViewer::ExitOnComplete) - QApplication::exit(hasFailed?-1:0); - else if (options & QmlViewer::Play) + + if (options & QmlViewer::Play) qWarning("Script playback complete"); } |