diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2012-04-10 18:11:30 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 13:15:01 +0200 |
commit | 6f3bda0dce945a5fc75d8ebad302820fe9979d9b (patch) | |
tree | 6581aad8a7fb21ccbebe09d23c30af0e3236e266 /tools/qmlscene/main.cpp | |
parent | 44f9412bf789d73dd462292038686f5b07026132 (diff) |
Initial bundle support
Change-Id: I095249f64ecf4ef1e3fbfb164e3d50edffab61e8
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'tools/qmlscene/main.cpp')
-rw-r--r-- | tools/qmlscene/main.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 32c9be7f46..0d97ba190b 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -350,6 +350,8 @@ static void usage() qWarning(" --no-version-detection .................... Do not try to detect the version of the .qml file"); qWarning(" --slow-animations ......................... Run all animations in slow motion"); qWarning(" --quit .................................... Quit immediately after starting"); + qWarning(" -I <path> ................................. Add <path> to the list of import paths"); + qWarning(" -B <name> <file> .......................... Add a named bundle"); qWarning(" "); exit(1); @@ -360,6 +362,7 @@ int main(int argc, char ** argv) Options options; QStringList imports; + QList<QPair<QString, QString> > bundles; for (int i = 1; i < argc; ++i) { if (*argv[i] != '-' && QFileInfo(QFile::decodeName(argv[i])).exists()) { options.file = QUrl::fromLocalFile(argv[i]); @@ -379,7 +382,11 @@ int main(int argc, char ** argv) options.quitImmediately = true; else if (lowerArgument == QLatin1String("-i") && i + 1 < argc) imports.append(QString::fromLatin1(argv[++i])); - else if (lowerArgument == QLatin1String("--help") + else if (lowerArgument == QLatin1String("-b") && i + 2 < argc) { + QString name = QString::fromLatin1(argv[++i]); + QString file = QString::fromLatin1(argv[++i]); + bundles.append(qMakePair(name, file)); + } else if (lowerArgument == QLatin1String("--help") || lowerArgument == QLatin1String("-help") || lowerArgument == QLatin1String("--h") || lowerArgument == QLatin1String("-h")) @@ -416,6 +423,8 @@ int main(int argc, char ** argv) engine = qxView->engine(); for (int i = 0; i < imports.size(); ++i) engine->addImportPath(imports.at(i)); + for (int i = 0; i < bundles.size(); ++i) + engine->addNamedBundle(bundles.at(i).first, bundles.at(i).second); window = qxView; if (options.file.isLocalFile()) { QFileInfo fi(options.file.toLocalFile()); |