From 1a26446186b19fadc0592a4b12d2830d4995cbd3 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Thu, 31 Jul 2014 15:11:58 +0200 Subject: [PATCH] qmljs: do not try to dump without uri qmlplugindump --path always fails, so skip it Change-Id: Ica2d25c864104aa77efbc26913b079c98ff5e283 Reviewed-by: Kai Koehne --- src/libs/qmljs/qmljsplugindumper.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp index bdd6c63cf4c..18fb1666ed1 100644 --- a/src/libs/qmljs/qmljsplugindumper.cpp +++ b/src/libs/qmljs/qmljsplugindumper.cpp @@ -465,18 +465,13 @@ 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()) { - args << QLatin1String("--path"); - args << plugin.importPath; - if (ComponentVersion(plugin.importVersion).isValid()) - args << plugin.importVersion; - } else { - if (info.qmlDumpHasRelocatableFlag) - args << QLatin1String("-relocatable"); - args << plugin.importUri; - args << plugin.importVersion; - args << plugin.importPath; - } + if (plugin.importUri.isEmpty()) + return; // dumping with --path always fails + if (info.qmlDumpHasRelocatableFlag) + args << QLatin1String("-relocatable"); + args << plugin.importUri; + args << plugin.importVersion; + args << plugin.importPath; process->start(info.qmlDumpPath, args); m_runningQmldumps.insert(process, plugin.qmldirPath); }