diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-20 11:31:40 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-20 13:53:38 +0200 |
commit | a45e31a42de7a6523588aba691f574644021a7a9 (patch) | |
tree | db5327c7686af5171c12c786f029f33bac2e28f0 /src/qmlcompiler/qqmljsimporter.cpp | |
parent | f9590f2cb601bbba67f4b4024b91766faec8190f (diff) |
QmlCompiler: Cache builtin types
If we import the builtin types multiple times from different places, we
want them to match.
Change-Id: I3f2f0ec0d72fb4e178ee69517ecafa8260ebc35e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmlcompiler/qqmljsimporter.cpp')
-rw-r--r-- | src/qmlcompiler/qqmljsimporter.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qmlcompiler/qqmljsimporter.cpp b/src/qmlcompiler/qqmljsimporter.cpp index 96df18937e..c6640316fa 100644 --- a/src/qmlcompiler/qqmljsimporter.cpp +++ b/src/qmlcompiler/qqmljsimporter.cpp @@ -234,6 +234,9 @@ void QQmlJSImporter::processImport( */ QQmlJSImporter::ImportedTypes QQmlJSImporter::importBuiltins() { + if (!m_builtins.isEmpty()) + return m_builtins; + AvailableTypes types; for (auto const &dir : m_importPaths) { @@ -246,7 +249,8 @@ QQmlJSImporter::ImportedTypes QQmlJSImporter::importBuiltins() processImport(result, &types); } - return types.qmlNames; + m_builtins = types.qmlNames; + return m_builtins; } /*! |