From 27d5e309a921269eae79620fa19dd205d52f62c5 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Mon, 24 Nov 2014 19:50:31 +0100 Subject: [PATCH] qmljs: ignore dump errors on initial scan Change-Id: I7dd5d472148244116bf3d5e3dcc55e74f2c8f203 Reviewed-by: Tim Jenssen Reviewed-by: Fawzi Mohamed --- src/libs/qmljs/qmljsplugindumper.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp index 558b25bc4a1..2f4c6629f10 100644 --- a/src/libs/qmljs/qmljsplugindumper.cpp +++ b/src/libs/qmljs/qmljsplugindumper.cpp @@ -435,6 +435,9 @@ void PluginDumper::dump(const Plugin &plugin) return; } + if (plugin.importUri.isEmpty()) + return; // initial scan without uri, ignore + if (!info.tryQmlDump || info.qmlDumpPath.isEmpty()) { if (!libraryInfo.isValid()) return; @@ -459,8 +462,6 @@ void PluginDumper::dump(const Plugin &plugin) connect(process, SIGNAL(finished(int)), SLOT(qmlPluginTypeDumpDone(int))); connect(process, SIGNAL(error(QProcess::ProcessError)), SLOT(qmlPluginTypeDumpError(QProcess::ProcessError))); QStringList args; - if (plugin.importUri.isEmpty()) - return; // dumping with --path always fails if (info.qmlDumpHasRelocatableFlag) args << QLatin1String("-nonrelocatable"); args << plugin.importUri;