diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-08 11:04:30 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-08 11:04:30 +0200 |
| commit | bde8c3cd9583ed9f3bdfc36a8699f56db20a6928 (patch) | |
| tree | 33246b027739aafd72f9f289876f69627537f2b3 /src/qml/qml/qqmltypeloader.cpp | |
| parent | b63bc868875d7571bc332804f984824cff7c5b78 (diff) | |
| parent | 685ad676a84bf48602a5da8f7171792686b94a73 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/new-backend
Conflicts:
src/qml/compiler/qv4isel_moth.cpp
src/qml/compiler/qv4jsir.cpp
src/qml/jsruntime/qv4mathobject.cpp
Change-Id: I426f1f4f0a5302b5bcff021de11766a03fec7637
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 013ed48c70..38c14c2979 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -2296,7 +2296,7 @@ void QQmlTypeData::done() } } - m_compiledData->finalize(enginePrivate); + m_compiledData->finalizeCompositeType(enginePrivate); } { |