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

qmljs: ignore dump errors on initial scan

Browse Source 
Change-Id: I7dd5d472148244116bf3d5e3dcc55e74f2c8f203
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
This commit is contained in:
Fawzi Mohamed
2014-11-24 19:50:31 +01:00
committed by Fawzi Mohamed
parent 2c0125f67b
commit 27d5e309a9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -435,6 +435,9 @@ void PluginDumper::dump(const Plugin &plugin)
return; return;
} }
if (plugin.importUri.isEmpty())
return; // initial scan without uri, ignore
if (!info.tryQmlDump || info.qmlDumpPath.isEmpty()) { if (!info.tryQmlDump || info.qmlDumpPath.isEmpty()) {
if (!libraryInfo.isValid()) if (!libraryInfo.isValid())
return; return;
@@ -459,8 +462,6 @@ void PluginDumper::dump(const Plugin &plugin)
connect(process, SIGNAL(finished(int)), SLOT(qmlPluginTypeDumpDone(int))); connect(process, SIGNAL(finished(int)), SLOT(qmlPluginTypeDumpDone(int)));
connect(process, SIGNAL(error(QProcess::ProcessError)), SLOT(qmlPluginTypeDumpError(QProcess::ProcessError))); connect(process, SIGNAL(error(QProcess::ProcessError)), SLOT(qmlPluginTypeDumpError(QProcess::ProcessError)));
QStringList args; QStringList args;
if (plugin.importUri.isEmpty())
return; // dumping with --path always fails
if (info.qmlDumpHasRelocatableFlag) if (info.qmlDumpHasRelocatableFlag)
args << QLatin1String("-nonrelocatable"); args << QLatin1String("-nonrelocatable");
args << plugin.importUri; args << plugin.importUri;