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

QmlJS: Fix implicit "." import when . has a QML module.

Browse Source 
Reviewed-by: Erik Verbruggen
This commit is contained in:
Christian Kamm
2011-03-10 14:49:38 +01:00
parent ffd6d307a0
commit b980a9b964
7 changed files with 188 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmljstools/qmljsplugindumper.cpp
View File

@@ -275,10 +275,16 @@ 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;
args << QLatin1String("--notrelocatable"); // ### temporary until relocatable libraries work
args << plugin.importUri;
args << plugin.importVersion;
args << plugin.importPath;
if (plugin.importUri.isEmpty()) {
args << QLatin1String("--path");
args << plugin.importPath;
if (ComponentVersion(plugin.importVersion).isValid())
args << plugin.importVersion;
} else {
args << plugin.importUri;
args << plugin.importVersion;
args << plugin.importPath;
}
process->start(info.qmlDumpPath, args);
m_runningQmldumps.insert(process, plugin.qmldirPath);
}