summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorFawzi Mohamed <fawzi.mohamed@digia.com>2013-04-23 17:09:22 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-25 12:51:42 (GMT)
commitfc5b97071de41026e31f48b17b9189362136ecb2 (patch)
tree24838f5d94db27bf76d9f2c4816f07782b98756f /tools
parentc0688f4117304b4828796aa9489ca2c0d50c9886 (diff)
downloadQt-fc5b97071de41026e31f48b17b9189362136ecb2.zip
Qt-fc5b97071de41026e31f48b17b9189362136ecb2.tar.gz
Qt-fc5b97071de41026e31f48b17b9189362136ecb2.tar.bz2
qmlplugindump: add an explicit -relocatable flag
* explicit -relocatable will allows us to change the default to nonrelocatable. * add support for both -notrelocatable and the grammatically correct -nonrelocatable. * backport from qt5 Change-Id: I0f5335e2cf86ba2eda7ad80b4f7271b8b6ddcada Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlplugindump/main.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index b96a726..cf422cd 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -482,7 +482,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.particles 4.7 /home/user/dev/qt-install/imports").arg(
@@ -529,8 +529,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;