aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlvaluetypewrapper.cpp
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-09-09 09:44:14 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-09-21 12:03:30 +0200
commit47313e5181e87fd904e6de41c75dfc844ec3f278 (patch)
tree3042c547d99bf6ce11df2152a82496085910f189 /src/qml/qml/qqmlvaluetypewrapper.cpp
parente60ac3f16ac3acb3a94a75566e07d302d87b8d09 (diff)
Rename QQmlQPointer to QV4QPointer
You can wrap QObject pointers in plain JavaScript. Change-Id: I246a72a7d5d7b2562e722bf9eafc7880b772a806 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlvaluetypewrapper.cpp')
-rw-r--r--src/qml/qml/qqmlvaluetypewrapper.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index 1bc1674fae..aeee32bc7b 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -78,7 +78,7 @@ struct QQmlValueTypeReference : QQmlValueTypeWrapper
object.destroy();
QQmlValueTypeWrapper::destroy();
}
- QQmlQPointer<QObject> object;
+ QV4QPointer<QObject> object;
int property;
};
@@ -598,7 +598,7 @@ bool QQmlValueTypeWrapper::virtualPut(Managed *m, PropertyKey id, const Value &v
if (reference) {
QV4::ScopedFunctionObject f(scope, value);
- const QQmlQPointer<QObject> &referenceObject = reference->d()->object;
+ const QV4QPointer<QObject> &referenceObject = reference->d()->object;
const int referencePropertyIndex = reference->d()->property;
if (f) {