diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-12-19 11:14:27 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-02-02 09:37:40 +0000 |
| commit | 65606ea1559572d66ee8bfac77e87f3e8f447c3e (patch) | |
| tree | ac129f9b750303c553bcf2021798ccdb9c24c48c /src/qml/types/qqmllistmodel.cpp | |
| parent | 4939f4dd65ea28268656682ffa1378a9697fe5ac (diff) | |
Remove double indirection between QJSEngine and QV4::ExecutionEngine
As QJSEngine's handle() method is internal, we can redefine it to return
a pointer to an ExecutionEngine. That makes many things easier.
Change-Id: Ie3df99e0bad5f00ad4fe73182896cd135fa82994
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/types/qqmllistmodel.cpp')
| -rw-r--r-- | src/qml/types/qqmllistmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index 3e477edc07..299de8de70 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -1865,7 +1865,7 @@ QQmlListModel *QQmlListModel::createWithOwner(QQmlListModel *newOwner) QV4::ExecutionEngine *QQmlListModel::engine() const { if (m_engine == 0) { - m_engine = QQmlEnginePrivate::get(qmlEngine(this))->v4engine(); + m_engine = qmlEngine(this)->handle(); } return m_engine; @@ -2682,7 +2682,7 @@ void QQmlListModelParser::applyBindings(QObject *obj, QV4::CompiledData::Compila { QQmlListModel *rv = static_cast<QQmlListModel *>(obj); - rv->m_engine = QV8Engine::getV4(qmlEngine(rv)); + rv->m_engine = qmlEngine(rv)->handle(); const QV4::CompiledData::Unit *qmlUnit = compilationUnit->data; |