Merge remote-tracking branch 'origin/tqtc/lts-6.2.6' into tqtc/lts-6.2-opensource

Change-Id: Ie5a87ae61d8ed0429225353ad46e5232d60f4daa

1 files changed, 3 insertions, 1 deletions

diff --git a/src/qmlmodels/qqmladaptormodel.cpp b/src/qmlmodels/qqmladaptormodel.cpp
index e55845d3e2..f283271018 100644
--- a/src/qmlmodels/qqmladaptormodel.cpp
+++ b/src/qmlmodels/qqmladaptormodel.cpp
@@ -967,7 +967,9 @@ void QQmlAdaptorModel::setModel(const QVariant &variant, QObject *)
 {
     accessors->cleanup(*this);
 
+    // Don't use variant anymore after this. list may transform it.
     list.setList(variant);
+
     modelStrongReference.clear();
 
     if (QObject *object = qvariant_cast<QObject *>(list.list())) {
@@ -979,7 +981,7 @@ void QQmlAdaptorModel::setModel(const QVariant &variant, QObject *)
         else
             accessors = new VDMObjectDelegateDataType;
     } else if (list.type() == QQmlListAccessor::ListProperty) {
-        auto object = static_cast<const QQmlListReference *>(variant.constData())->object();
+        auto object = static_cast<const QQmlListReference *>(list.list().constData())->object();
         if (QQmlData *ddata = QQmlData::get(object))
             modelStrongReference = ddata->jsWrapper;
         setObject(object);