Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 3 insertions, 0 deletions

diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index f11c7c9..b7a3f1a 100644
--- a/tools/qmlviewer/main.cpp
+++ b/tools/qmlviewer/main.cpp
@@ -83,6 +83,7 @@ void usage()
     qWarning("  -skin <qvfbskindir> ...................... run with a skin window frame");
     qWarning("                                             \"list\" for a list of built-ins");
     qWarning("  -resizeview .............................. resize the view, not the skin");
+    qWarning("  -qmlbrowser .............................. use a QML-based file browser");
     qWarning("  -recordfile <output> ..................... set video recording file");
     qWarning("                                              - ImageMagick 'convert' for GIF)");
     qWarning("                                              - png file for raw frames");
@@ -222,6 +223,8 @@ int main(int argc, char ** argv)
             translationFile = argv[++i];
         } else if (arg == "-opengl") {
             useGL = true;
+        } else if (arg == "-qmlbrowser") {
+            useNativeFileBrowser = false;
         } else if (arg == "-L") {
             if (lastArg) usage();
             libraries << QString(argv[++i]);