diff options
Diffstat (limited to 'src/qml/jsruntime/qv4variantobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4variantobject.cpp | 58 |
1 files changed, 16 insertions, 42 deletions
diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp index ee813b68de..62e21a120c 100644 --- a/src/qml/jsruntime/qv4variantobject.cpp +++ b/src/qml/jsruntime/qv4variantobject.cpp @@ -1,45 +1,8 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qv4variantobject_p.h" #include "qv4functionobject_p.h" -#include "qv4objectproto_p.h" #include <private/qqmlvaluetypewrapper_p.h> #include <private/qv4qobjectwrapper_p.h> @@ -55,10 +18,10 @@ void Heap::VariantObject::init() scarceData = new ExecutionEngine::ScarceResourceData; } -void Heap::VariantObject::init(const QVariant &value) +void Heap::VariantObject::init(const QMetaType type, const void *data) { Object::init(); - scarceData = new ExecutionEngine::ScarceResourceData(value); + scarceData = new ExecutionEngine::ScarceResourceData(type, data); if (isScarce()) removeVmePropertyReference(); } @@ -168,7 +131,18 @@ ReturnedValue VariantPrototype::method_valueOf(const FunctionObject *b, const Va return Encode(v.toBool()); default: if (QMetaType(v.metaType()).flags() & QMetaType::IsEnumeration) - RETURN_RESULT(Encode(v.toInt())); + if (v.metaType().sizeOf() <= qsizetype(sizeof(int))) + return Encode(v.toInt()); + if (v.canConvert<double>()) + return Encode(v.toDouble()); + if (v.canConvert<int>()) + return Encode(v.toInt()); + if (v.canConvert<uint>()) + return Encode(v.toUInt()); + if (v.canConvert<bool>()) + return Encode(v.toBool()); + if (v.canConvert<QString>()) + return Encode(b->engine()->newString(v.toString())); break; } } |