diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-06 13:06:15 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-06 11:24:02 +0000 |
| commit | 791e63021e1e1333ff3c678674df8f4f18212e43 (patch) | |
| tree | 29d66f735aa1a2d5fe3bf3b8b0625725f55c19e2 /src/qml/qml | |
| parent | 803e1d2dc77522665fbfd4ddaa911825bcd50892 (diff) | |
Move QQmlIR::IRLoader out of qqmlirbuilder*
We don't need it to build the IR and we can drop a few checks for
V4_BOOTSTRAP this way.
Change-Id: I9464e65528c70c42ebc8ddad576eaab001dc9d2f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 457558fb56..1f80e1905e 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -52,6 +52,7 @@ #include <private/qqmlpropertyvalidator_p.h> #include <private/qqmlpropertycachecreator_p.h> #include <private/qv4module_p.h> +#include <private/qqmlirloader_p.h> #include <QtCore/qdir.h> #include <QtCore/qfile.h> @@ -2502,7 +2503,7 @@ void QQmlTypeData::dataReceived(const SourceCodeData &data) void QQmlTypeData::initializeFromCachedUnit(const QV4::CompiledData::Unit *unit) { m_document.reset(new QmlIR::Document(isDebugging())); - QmlIR::IRLoader loader(unit, m_document.data()); + QQmlIRLoader loader(unit, m_document.data()); loader.load(); m_document->jsModule.fileName = urlString(); m_document->jsModule.finalUrl = finalUrlString(); @@ -2544,7 +2545,7 @@ bool QQmlTypeData::loadFromSource() void QQmlTypeData::restoreIR(QQmlRefPointer<QV4::CompiledData::CompilationUnit> unit) { m_document.reset(new QmlIR::Document(isDebugging())); - QmlIR::IRLoader loader(unit->unitData(), m_document.data()); + QQmlIRLoader loader(unit->unitData(), m_document.data()); loader.load(); m_document->jsModule.fileName = urlString(); m_document->jsModule.finalUrl = finalUrlString(); |