diff options
author | Albert Astals Cid <albert.astals@canonical.com> | 2015-10-15 17:26:04 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-12-15 05:09:22 +0000 |
commit | ac68eb35e636c23bd0cb5293be5151163bb3a853 (patch) | |
tree | 22519b877c3dac1a33f405212e7a22088769c9dc /tools/qmlplugindump | |
parent | 764a4056a712320647cd3331e2b26acdc8332da4 (diff) |
qmlplugindump: Don't try to import Qt.test.qtestroot
Qt.test.qtestroot is only provided by quick_test_main so
if we find any plugin that tries to inherit from TestCase.qml
qmlplugindump will fail trying to import this unexistant import
Change-Id: Idee881fa641267a17594dd3c92e929ca3473f3df
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'tools/qmlplugindump')
-rw-r--r-- | tools/qmlplugindump/main.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 0f73afcc7b..aa2e8755e6 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -849,6 +849,14 @@ static bool getDependencies(const QQmlEngine &engine, const QString &pluginImpor std::cerr << "failed to proecess output of qmlimportscanner" << std::endl; return false; } + + QStringList aux; + foreach (const QString &str, *dependencies) { + if (!str.startsWith("Qt.test.qtestroot")) + aux += str; + } + *dependencies = aux; + return true; } |