diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2019-11-08 11:35:30 +0100 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2019-11-08 14:46:56 +0100 |
commit | ee8589dd9a681a469511308345e4ef0b304aaaab (patch) | |
tree | 7e61e6c309ff9552b1a56ca6502db2029e2fdce7 /src/qml/qml/qqmltypewrapper.cpp | |
parent | 8f4765534f83c27301ea758f5189f8f9b6684b6b (diff) |
instanceof: return false instead of throwing
[ChangeLog][Important Behavior Changes] Using instanceof to check
whether an instance has the type of QObject or one of its derived
classes used to raise a TypeError, if the instance was not derived from
QObject. Now, it instead returns false, which is more in line with the
ECMAScript semantic.
Fixes: QTBUG-79868
Change-Id: I0999807165eb36e7ebb888dce66238619a02a127
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltypewrapper.cpp')
-rw-r--r-- | src/qml/qml/qqmltypewrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmltypewrapper.cpp b/src/qml/qml/qqmltypewrapper.cpp index ef4a628a04..fa5d36503d 100644 --- a/src/qml/qml/qqmltypewrapper.cpp +++ b/src/qml/qml/qqmltypewrapper.cpp @@ -400,7 +400,7 @@ ReturnedValue QQmlTypeWrapper::virtualInstanceOf(const Object *typeObject, const // can only compare a QObject* against a QML type const QObjectWrapper *wrapper = var.as<QObjectWrapper>(); if (!wrapper) - return engine->throwTypeError(); + return QV4::Encode(false); // in case the wrapper outlived the QObject* const QObject *wrapperObject = wrapper->object(); |