diff options
author | Erik Verbruggen <erik@verbruggen.consulting> | 2021-03-17 11:38:33 +0100 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@me.com> | 2021-03-19 10:43:23 +0000 |
commit | 5ad724a3ac3456f46bc487e5cd68bdeb13db4dad (patch) | |
tree | 83e3e047b2314e9b9fd819d9e17c544315e5733c /src/libs/qmljs/qmljsmodelmanagerinterface.cpp | |
parent | 98dc428c6970d9ee2f73b3e3e7830b7014cbc62d (diff) | |
download | qt-creator-5ad724a3ac3456f46bc487e5cd68bdeb13db4dad.tar.gz |
Support for QML module mapping
QUL uses module mapping for theming of QtQuick.Controls: during
code-generation the compiler is pointed to the Controls implementation
it should use. This is done by rewriting any import of QtQuick.Controls
with the given module name. The CMake build scripts will write a file
for each target to the directory "qml_module_mappings" in the build dir,
and those files will contain the mappings used.
Fixes: QTCREATORBUG-25356
Change-Id: I3f74897836dde7717b03bd6dffa46dcc0689ffdd
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
Diffstat (limited to 'src/libs/qmljs/qmljsmodelmanagerinterface.cpp')
-rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index e1189754bd..ffcabfc18b 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -615,6 +615,7 @@ ModelManagerInterface::ProjectInfo ModelManagerInterface::projectInfoForPath( res.applicationDirectories.append(pInfo.applicationDirectories); for (const auto &importPath : pInfo.importPaths) res.importPaths.maybeInsert(importPath); + res.moduleMappings.insert(pInfo.moduleMappings); } res.applicationDirectories = Utils::filteredUnique(res.applicationDirectories); return res; |