diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-05-18 13:41:04 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-05-28 15:10:05 +0000 |
| commit | 2e17c1bed2f0690342f98130701ebfe088075a60 (patch) | |
| tree | 1a5d21784a7dbebe6d53a5b9c29a6a29c83a5c25 /src/qml/types/qqmllistmodel_p.h | |
| parent | 7f93ecd31494d17351ff8e16820b7117aa07d90b (diff) | |
Fix language change support for qsTr in ListElement
We must store translations by binding reference in order to support
translation changes. This is similar to commit
db15c3455971f47b86078a44a30e0f0a13b54204.
[ChangeLog][QtQml] Fix QQmlEngine::retranslate() with ListElement
objects that use translation functions such as qsTr.
Task-number: QTBUG-68350
Change-Id: Ie5b4d5beb0505a260b524da820c0ce1142893d54
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/types/qqmllistmodel_p.h')
| -rw-r--r-- | src/qml/types/qqmllistmodel_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/types/qqmllistmodel_p.h b/src/qml/types/qqmllistmodel_p.h index 0a9d29ac05..56a1a95a02 100644 --- a/src/qml/types/qqmllistmodel_p.h +++ b/src/qml/types/qqmllistmodel_p.h @@ -124,6 +124,7 @@ private: friend class ListElement; friend class DynamicRoleModelNode; friend class DynamicRoleModelNodeMetaObject; + friend struct StringOrTranslation; // Constructs a flat list model for a worker agent QQmlListModel(QQmlListModel *orig, QQmlListModelWorkerAgent *agent); @@ -135,6 +136,7 @@ private: QQmlListModelWorkerAgent *m_agent; mutable QV4::ExecutionEngine *m_engine; + QQmlRefPointer<QV4::CompiledData::CompilationUnit> m_compilationUnit; bool m_mainThread; bool m_primary; |