diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-30 07:30:01 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-30 07:30:01 (GMT) |
commit | c2bee860f72898c6d57ff9f117256059b3952479 (patch) | |
tree | 8f190bac91f9cbd11e6e52479a3effea132a3a20 /tools/qml | |
parent | de306893b464ed0fa00f98488912fd6269713519 (diff) | |
parent | c4f59859a589b76419e9133110eda850223f03dd (diff) | |
download | Qt-c2bee860f72898c6d57ff9f117256059b3952479.zip Qt-c2bee860f72898c6d57ff9f117256059b3952479.tar.gz Qt-c2bee860f72898c6d57ff9f117256059b3952479.tar.bz2 |
Merge remote branch 'origin/4.7' into qt-4.7-from-4.6
Conflicts:
mkspecs/common/symbian/symbian.conf
src/3rdparty/webkit/WebCore/WebCore.pro
Diffstat (limited to 'tools/qml')
-rw-r--r-- | tools/qml/main.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index a4de339..8062e8e 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -41,6 +41,7 @@ #include "qdeclarative.h" #include "qmlruntime.h" +#include "qdeclarativeengine.h" #include <QWidget> #include <QDir> #include <QApplication> @@ -100,7 +101,8 @@ 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(" -L <directory> ........................... prepend to the library search path,"); + qWarning(" display path if <directory> is empty"); 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"); @@ -238,7 +240,12 @@ int main(int argc, char ** argv) } else if (arg == "-qmlbrowser") { useNativeFileBrowser = false; } else if (arg == "-L") { - if (lastArg) usage(); + 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]); } else if (arg == "-script") { if (lastArg) usage(); |