QQmlStrongJSQObjectReference: rename setObject() argument o → obj

It shadowed a member of *this (QQmlGuardImpl::o).

Change-Id: Ibb4175c27c240102efa86d34b5a822ea70a3a4c3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 88b2a368dcb3e84c762143307d2af90a5314b419)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/qml/qml/qqmlguard_p.h b/src/qml/qml/qqmlguard_p.h
index e36af7f133..5b3868eeab 100644
--- a/src/qml/qml/qqmlguard_p.h
+++ b/src/qml/qml/qqmlguard_p.h
@@ -109,19 +109,19 @@ template <typename T>
 class QQmlStrongJSQObjectReference : public QQmlGuard<T>
 {
 public:
-    void setObject(T *o, QObject *parent) {
+    void setObject(T *obj, QObject *parent) {
         T *old = this->object();
-        if (o == old)
+        if (obj == old)
             return;
 
         if (m_jsOwnership && old && old->parent() == parent)
             QQml_setParent_noEvent(old, nullptr);
 
-        this->QQmlGuard<T>::operator=(o);
+        this->QQmlGuard<T>::operator=(obj);
 
-        if (o && !o->parent() && !QQmlData::keepAliveDuringGarbageCollection(o)) {
+        if (obj && !obj->parent() && !QQmlData::keepAliveDuringGarbageCollection(obj)) {
             m_jsOwnership = true;
-            QQml_setParent_noEvent(o, parent);
+            QQml_setParent_noEvent(obj, parent);
         } else {
             m_jsOwnership = false;
         }