diff options
author | Janne Koskinen <janne.p.koskinen@qt.io> | 2021-05-27 15:27:53 +0300 |
---|---|---|
committer | Janne Koskinen <janne.p.koskinen@qt.io> | 2021-05-28 12:58:09 +0300 |
commit | 5195163bcb0be9e5a13c940cbe324ca9f8be6145 (patch) | |
tree | bc395fa3a33f1b96e130658c6c28746d1aaf7399 /src/qml/jsruntime/qv4qobjectwrapper.cpp | |
parent | f9f8d606be0603474f393689f2abc7ac6d1771dd (diff) |
Clarify ambiguous Object to be one under V4
Fixes Integrity "ambiguous" compiler error
Change-Id: Iea96eba25df83d97ea29b205fcb779f6efbe3d7f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4qobjectwrapper.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index 1ee004550c..ac9d52292b 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -143,7 +143,7 @@ static QV4::ReturnedValue loadProperty(QV4::ExecutionEngine *v4, QObject *object QV4::ReturnedValue ret = QV4::QObjectWrapper::wrap(v4, rv); if (property.propType().flags().testFlag(QMetaType::IsConst)) { QV4::ScopedValue v(scope, ret); - if (auto obj = v->as<Object>()) { + if (auto obj = v->as<QV4::Object>()) { obj->setInternalClass(obj->internalClass()->cryopreserved()); return obj->asReturnedValue(); } |