diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-21 10:58:50 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-21 10:58:51 +0100 |
commit | 848245c7d3e99f14f50417e45fcfdff2a7022502 (patch) | |
tree | a583ed65d09e27078f3178a7bbe890335c51a8a0 /src/qml/qml/qqmltypeloader.cpp | |
parent | ef10b82a28114718591bcdabec031ce05caacf37 (diff) | |
parent | 08778586413adad7b3af35c7cb97416757d599c0 (diff) |
Merge remote-tracking branch 'origin/5.9.3' into 5.10.0
Change-Id: Id2b11dccb04fc99d10608f690f5827bfa9b2114c
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
-rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 8e9f57f661..128e37d51b 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -2409,7 +2409,15 @@ void QQmlTypeData::dataReceived(const SourceCodeData &data) void QQmlTypeData::initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit) { m_document.reset(new QmlIR::Document(isDebugging())); - unit->loadIR(m_document.data(), unit); + if (unit->loadIR) { + // old code path for older generated code + unit->loadIR(m_document.data(), unit); + } else { + // new code path + QmlIR::IRLoader loader(unit->qmlData, m_document.data()); + loader.load(); + m_document->javaScriptCompilationUnit.adopt(unit->createCompilationUnit()); + } continueLoadFromIR(); } |