Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

1 files changed, 5 insertions, 1 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 01b3912..45c2b85 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -121,6 +121,8 @@ void scriptOptsUsage()
     qWarning("  play ..................................... playback an existing script");
     qWarning("  testimages ............................... record images or compare images on playback");
     qWarning("  testerror ................................ test 'error' property of root item on playback");
+    qWarning("  snapshot ................................. file being recorded is static,");
+    qWarning("                                             only one frame will be recorded or tested");
     qWarning("  exitoncomplete ........................... cleanly exit the viewer on script completion");
     qWarning("  exitonfailure ............................ immediately exit the viewer on script failure");
     qWarning("  saveonexit ............................... save recording on viewer exit");
@@ -243,7 +245,7 @@ int main(int argc, char ** argv)
             useNativeFileBrowser = false;
         } else if (arg == "-I" || arg == "-L") {
             if (arg == "-L")
-                fprintf(stderr, "-L option provided for compatibility only, use -I instead");
+                fprintf(stderr, "-L option provided for compatibility only, use -I instead\n");
             if (lastArg) {
                 QDeclarativeEngine tmpEngine;
                 QString paths = tmpEngine.importPathList().join(QLatin1String(":"));
@@ -309,6 +311,8 @@ int main(int argc, char ** argv)
                 scriptOptions |= QDeclarativeViewer::ExitOnFailure;
             } else if (option == QLatin1String("saveonexit")) {
                 scriptOptions |= QDeclarativeViewer::SaveOnExit;
+            } else if (option == QLatin1String("snapshot")) {
+                scriptOptions |= QDeclarativeViewer::Snapshot;
             } else {
                 scriptOptsUsage();
             }