diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-27 13:18:05 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-04-27 13:18:05 +0000 |
| commit | dee67b41b031791c7b6313e935e622ef8d594686 (patch) | |
| tree | 1f25dc9ac0deb8b54ce2c2eff0bd855636a5f54b /src/qml/types | |
| parent | 0699f27c9da6629ca02a1920146cb32999401676 (diff) | |
| parent | e2447f9f5fbe6c8c070ce454bb48c5e45b8c35b3 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmlinstantiator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/types/qqmlinstantiator.cpp b/src/qml/types/qqmlinstantiator.cpp index 0137a2796d..7626ba5a05 100644 --- a/src/qml/types/qqmlinstantiator.cpp +++ b/src/qml/types/qqmlinstantiator.cpp @@ -193,7 +193,7 @@ void QQmlInstantiatorPrivate::_q_modelUpdated(const QQmlChangeSet &changeSet, bo void QQmlInstantiatorPrivate::makeModel() { Q_Q(QQmlInstantiator); - QQmlDelegateModel* delegateModel = new QQmlDelegateModel(qmlContext(q)); + QQmlDelegateModel* delegateModel = new QQmlDelegateModel(qmlContext(q), q); instanceModel = delegateModel; ownModel = true; delegateModel->setDelegate(delegate); |