diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-10-09 01:36:11 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-10-09 01:36:11 (GMT) |
| commit | 91c85c76d83260d794701100b36a0cc04f848932 (patch) | |
| tree | 86fd1204ad8358a0a41d8a61307e1d3e1ce16177 /tools | |
| parent | ccb3f7c3bda46ace7b42bff5a27a11bd07602b68 (diff) | |
| parent | dda314e206162215e60dd306b6347a04f19ca5df (diff) | |
| download | Qt-91c85c76d83260d794701100b36a0cc04f848932.zip Qt-91c85c76d83260d794701100b36a0cc04f848932.tar.gz Qt-91c85c76d83260d794701100b36a0cc04f848932.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/layouts/Button.qml
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"); } |