From: Fawzi Mohamed <fawzi.mohamed@digia.com>
Date: Tue, 23 Apr 2013 17:03:14 +0000 (+0200)
Subject: qmlplugindump: add an explicit -relocatable switch
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=fa4cafacff3a0541f58e9280b101f4577c250d1d;p=konrad%2Fqtdeclarative.git

qmlplugindump: add an explicit -relocatable switch

this will enable us to switch the default to nonrelocatable

Change-Id: Ic4bff6466ee2fb6d4d1dd89829034ad239422a7e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---

diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index a31bbe9..9d5cd1d 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -540,7 +540,7 @@ void sigSegvHandler(int) {
 void printUsage(const QString &appName)
 {
     qWarning() << qPrintable(QString(
-                                 "Usage: %1 [-v] [-notrelocatable] module.uri version [module/import/path]\n"
+                                 "Usage: %1 [-v] [-[non]relocatable] module.uri version [module/import/path]\n"
                                  "       %1 [-v] -path path/to/qmldir/directory [version]\n"
                                  "       %1 [-v] -builtins\n"
                                  "Example: %1 Qt.labs.folderlistmodel 2.0 /home/user/dev/qt-install/imports").arg(
@@ -591,8 +591,13 @@ int main(int argc, char *argv[])
             }
 
             if (arg == QLatin1String("--notrelocatable")
-                    || arg == QLatin1String("-notrelocatable")) {
+                    || arg == QLatin1String("-notrelocatable")
+                    || arg == QLatin1String("--nonrelocatable")
+                    || arg == QLatin1String("-nonrelocatable")) {
                 relocatable = false;
+            } else if (arg == QLatin1String("--relocatable")
+                        || arg == QLatin1String("-relocatable")) {
+                relocatable = true;
             } else if (arg == QLatin1String("--path")
                        || arg == QLatin1String("-path")) {
                 action = Path;