aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlscene
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2014-12-09 12:26:59 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2014-12-12 06:13:47 +0100
commit88508e9f4081a9b0008793dbe90c65f6b96c0f0f (patch)
tree9813ac08b1474051451f0926cc90d88594d20657 /tools/qmlscene
parentfdd367efd705f958af1f70413e726d337e8ec1ca (diff)
Remove QML bundle code
This feature is effectively not maintained, experimental and undocumented. Consensus on the mailing list is to remove it: http://lists.qt-project.org/pipermail/development/2014-December/019384.html Change-Id: Iaa73b3e90806c338ef81bbd4307ddd2addd37964 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Diffstat (limited to 'tools/qmlscene')
-rw-r--r--tools/qmlscene/main.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 2a86b724f4..73e8a9ac6d 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -351,7 +351,6 @@ static void usage()
puts(" --quit .................................... Quit immediately after starting");
puts(" --disable-context-sharing ................. Disable the use of a shared GL context for QtQuick Windows");
puts(" -I <path> ................................. Add <path> to the list of import paths");
- puts(" -B <name> <file> .......................... Add a named bundle");
puts(" -translation <translationfile> ............ Set the language to run in");
puts(" ");
@@ -363,7 +362,6 @@ 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]);
@@ -393,11 +391,7 @@ int main(int argc, char ** argv)
options.contextSharing = false;
else if (lowerArgument == QLatin1String("-i") && i + 1 < argc)
imports.append(QString::fromLatin1(argv[++i]));
- 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")
+ else if (lowerArgument == QLatin1String("--help")
|| lowerArgument == QLatin1String("-help")
|| lowerArgument == QLatin1String("--h")
|| lowerArgument == QLatin1String("-h"))
@@ -460,8 +454,6 @@ int main(int argc, char ** argv)
QPointer<QQmlComponent> component = new QQmlComponent(&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);
if (options.file.isLocalFile()) {
QFileInfo fi(options.file.toLocalFile());
#ifndef QT_NO_TRANSLATION