diff options
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/items/qquickitemview.cpp | 6 | ||||
-rw-r--r-- | src/quick/items/qquickpathview.cpp | 6 | ||||
-rw-r--r-- | src/quick/items/qquickrepeater.cpp | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index 2fd79715e1..93cb5e4e9d 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -273,9 +273,13 @@ QVariant QQuickItemView::model() const return d->modelVariant; } -void QQuickItemView::setModel(const QVariant &model) +void QQuickItemView::setModel(const QVariant &m) { Q_D(QQuickItemView); + QVariant model = m; + if (model.userType() == qMetaTypeId<QJSValue>()) + model = model.value<QJSValue>().toVariant(); + if (d->modelVariant == model) return; if (d->model) { diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index 825845eca9..6cf3e33de9 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -607,9 +607,13 @@ QVariant QQuickPathView::model() const return d->modelVariant; } -void QQuickPathView::setModel(const QVariant &model) +void QQuickPathView::setModel(const QVariant &m) { Q_D(QQuickPathView); + QVariant model = m; + if (model.userType() == qMetaTypeId<QJSValue>()) + model = model.value<QJSValue>().toVariant(); + if (d->modelVariant == model) return; diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp index 8e13947d78..e2a3043857 100644 --- a/src/quick/items/qquickrepeater.cpp +++ b/src/quick/items/qquickrepeater.cpp @@ -183,9 +183,13 @@ QVariant QQuickRepeater::model() const return d->dataSource; } -void QQuickRepeater::setModel(const QVariant &model) +void QQuickRepeater::setModel(const QVariant &m) { Q_D(QQuickRepeater); + QVariant model = m; + if (model.userType() == qMetaTypeId<QJSValue>()) + model = model.value<QJSValue>().toVariant(); + if (d->dataSource == model) return; |