1 files changed, 30 insertions, 5 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 5099e49..01b3912 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -101,8 +101,9 @@ void usage()
     qWarning("  -dragthreshold <size> .................... set mouse drag threshold size");
     qWarning("  -netcache <size> ......................... set disk cache to size bytes");
     qWarning("  -translation <translationfile> ........... set the language to run in");
-    qWarning("  -L <directory> ........................... prepend to the library search path,");
+    qWarning("  -I <directory> ........................... prepend to the module import search path,");
     qWarning("                                             display path if <directory> is empty");
+    qWarning("  -P <directory> ........................... prepend to the plugin search path");
     qWarning("  -opengl .................................. use a QGLWidget for the viewport");
     qWarning("  -script <path> ........................... set the script to use");
     qWarning("  -scriptopts <options>|help ............... set the script options to use");
@@ -167,7 +168,8 @@ int main(int argc, char ** argv)
     QString dither = "none";
     QString recordfile;
     QStringList recordargs;
-    QStringList libraries;
+    QStringList imports;
+    QStringList plugins;
     QString skin;
     QString script;
     QString scriptopts;
@@ -239,14 +241,19 @@ int main(int argc, char ** argv)
             useGL = true;
         } else if (arg == "-qmlbrowser") {
             useNativeFileBrowser = false;
-        } else if (arg == "-L") {
+        } else if (arg == "-I" || arg == "-L") {
+            if (arg == "-L")
+                fprintf(stderr, "-L option provided for compatibility only, use -I instead");
             if (lastArg) {
                 QDeclarativeEngine tmpEngine;
                 QString paths = tmpEngine.importPathList().join(QLatin1String(":"));
                 fprintf(stderr, "Current search path: %s\n", paths.toLocal8Bit().constData());
                 return 0;
             }
-            libraries << QString(argv[++i]);
+            imports << QString(argv[++i]);
+        } else if (arg == "-P") {
+            if (lastArg) usage();
+            plugins << QString(argv[++i]);
         } else if (arg == "-script") {
             if (lastArg) usage();
             script = QString(argv[++i]);
@@ -320,9 +327,12 @@ int main(int argc, char ** argv)
 
     viewer.addLibraryPath(QCoreApplication::applicationDirPath());
 
-    foreach (QString lib, libraries)
+    foreach (QString lib, imports)
         viewer.addLibraryPath(lib);
 
+    foreach (QString plugin, plugins)
+        viewer.addPluginPath(plugin);
+
     viewer.setNetworkCacheSize(cache);
     viewer.setRecordFile(recordfile);
     if (resizeview)
@@ -349,6 +359,21 @@ int main(int argc, char ** argv)
     viewer.setUseNativeFileBrowser(useNativeFileBrowser);
     if (fullScreen && maximized)
         qWarning() << "Both -fullscreen and -maximized specified. Using -fullscreen.";
+
+    if (fileName.isEmpty()) {
+        QFile qmlapp(QLatin1String("qmlapp"));
+        if (qmlapp.exists() && qmlapp.open(QFile::ReadOnly)) {
+                QString content = QString::fromUtf8(qmlapp.readAll());
+                qmlapp.close();
+
+                int newline = content.indexOf(QLatin1Char('\n'));
+                if (newline >= 0)
+                    fileName = content.left(newline);
+                else
+                    fileName = content;
+            }
+    }
+
     if (!fileName.isEmpty()) {
         viewer.open(fileName);
         fullScreen ? viewer.showFullScreen() : maximized ? viewer.showMaximized() : viewer.show();