diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-07 01:00:06 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-07 01:00:06 +0200 |
| commit | ec7caec4da0137f9d64384c96de39da9f504ab5d (patch) | |
| tree | 28a3fd954350fbf6a68111a1c8f08fff0e69cc88 /tools | |
| parent | 60a2c3e453177389c0dfbca9211fa2918755124d (diff) | |
| parent | 932100115bfd4d0ad5a3d8dad03c7af3b393a8b6 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I1d3012e8ebc94c68367214184f356cd06ebccff4
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 56bb633b9b..311e044ec3 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -1014,7 +1014,7 @@ int main(int argc, char *argv[]) #endif // QT_WIDGETS_LIB QCoreApplication::setApplicationVersion(QLatin1String(QT_VERSION_STR)); - const QStringList args = app->arguments(); + QStringList args = app->arguments(); const QString appName = QFileInfo(app->applicationFilePath()).baseName(); if (args.size() < 2) { printUsage(appName); @@ -1046,6 +1046,10 @@ int main(int argc, char *argv[]) return EXIT_INVALIDARGUMENTS; } dependenciesFile = args.at(iArg); + + // Remove absolute path so that it does not show up in the + // printed command line inside the plugins.qmltypes file. + args[iArg] = QFileInfo(args.at(iArg)).fileName(); } else if (arg == QLatin1String("--merge") || arg == QLatin1String("-merge")) { if (++iArg == args.size()) { |