feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmljs: do not try to dump without uri

Browse Source 
qmlplugindump --path always fails, so skip it

Change-Id: Ica2d25c864104aa77efbc26913b079c98ff5e283
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-07-31 15:11:58 +02:00
committed by Kai Koehne
parent 92cdd7045b
commit 1a26446186
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libs/qmljs/qmljsplugindumper.cpp
View File

@@ -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);
}