diff options
author | Marco Benelli <marco.benelli@qt.io> | 2017-02-16 15:58:09 +0100 |
---|---|---|
committer | Marco Benelli <marco.benelli@qt.io> | 2017-02-17 14:38:11 +0000 |
commit | 12db36d8a60c1133329dfc39820500549a7b0d7d (patch) | |
tree | 74c7483cc37fe78261c13e450a49da8b6feffb2d | |
parent | 06ad843b225bda9713507280347ee13be87c7882 (diff) |
qmlplugindump: import paths clean-up
Remove "qrc:/qt-project.org/imports" from the paths list passed to
qmlimportscanner.
qmlimportscanner will error out on a path that does not exist.
Since the internal qrc:/qt-project.org/imports path only exists if
the plugins are compiled in statically into qmlimportscanner, we
have to remove this path to stop it from erroring out.
Task-number: QTBUG-58930
Change-Id: I39525f2b6ff29c02b38f5f701342026dea871701
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r-- | tools/qmlplugindump/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 774be45aec..9e4bcf4414 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -839,7 +839,8 @@ static bool getDependencies(const QQmlEngine &engine, const QString &pluginImpor QStringList commandArgs = QStringList() << QLatin1String("-qmlFiles") << QLatin1String("-"); - const auto importPathList = engine.importPathList(); + QStringList importPathList = engine.importPathList(); + importPathList.removeOne(QStringLiteral("qrc:/qt-project.org/imports")); for (const QString &path : importPathList) commandArgs << QLatin1String("-importPath") << path; |