diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-25 12:41:25 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-11-25 12:41:25 +0000 |
commit | 22858d41a5351e1bc3ffd9778af77643d90e395f (patch) | |
tree | 69222d2b5288dbfb9784994dece21e58bd75f041 /src/qml/qml/qqmltypeloader.cpp | |
parent | efe1926598c69a09c9365673bba6961a83936d49 (diff) | |
parent | 23e97360bdc1327ab1b3b3c7e7db69a7c56ef1e0 (diff) |
Merge "Merge remote-tracking branch 'origin/5.9.3' into 5.9" into refs/staging/5.9
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 1a7b8250e7..f3077f673b 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -2427,7 +2427,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(); } |