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

qmljs: add explicit -relocatable flag to qmlplugindumper and use it

Browse Source 
This will allow changing the default to nonrelocatable.

Change-Id: I80746a3e70f94040a407cc25cec9ad6fac8b6fec
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Fawzi Mohamed
2013-04-24 12:21:21 +02:00
parent e793779589
commit eac15b5e7d
7 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -135,9 +135,11 @@ ModelManagerInterface::ProjectInfo QmlJSTools::defaultProjectInfoForProject(
toolChain,
preferDebugDump, &projectInfo.qmlDumpPath,
&projectInfo.qmlDumpEnvironment);
projectInfo.qmlDumpHasRelocatableFlag = qtVersion->hasQmlDumpWithRelocatableFlag();
} else {
projectInfo.qmlDumpPath.clear();
projectInfo.qmlDumpEnvironment.clear();
projectInfo.qmlDumpHasRelocatableFlag = true;
}
setupProjectInfoQmlBundles(projectInfo);
return projectInfo;

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

@@ -433,6 +433,8 @@ void PluginDumper::dump(const Plugin &plugin)
if (ComponentVersion(plugin.importVersion).isValid())
args << plugin.importVersion;
} else {
if (info.qmlDumpHasRelocatableFlag)
args << QLatin1String("-relocatable");
args << plugin.importUri;
args << plugin.importVersion;
args << plugin.importPath;