1 files changed, 27 insertions, 53 deletions

diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp
index e117e509ab..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,18 +18,18 @@ 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();
 }
 
 bool VariantObject::Data::isScarce() const
 {
-    QVariant::Type t = data().type();
-    return t == QVariant::Pixmap || t == QVariant::Image;
+    int t = data().userType();
+    return t == QMetaType::QPixmap || t == QMetaType::QImage;
 }
 
 bool VariantObject::virtualIsEqualTo(Managed *m, Managed *other)
@@ -139,7 +102,7 @@ ReturnedValue VariantPrototype::method_toString(const FunctionObject *b, const V
         RETURN_UNDEFINED();
     const QVariant variant = o->d()->data();
     QString result = variant.toString();
-    if (result.isEmpty() && !variant.canConvert(QVariant::String)) {
+    if (result.isEmpty() && !variant.canConvert(QMetaType(QMetaType::QString))) {
         QDebug dbg(&result);
         dbg << variant;
         // QDebug appends a space, we're not interested in continuing the stream so we chop it off.
@@ -154,21 +117,32 @@ ReturnedValue VariantPrototype::method_valueOf(const FunctionObject *b, const Va
     const VariantObject *o = thisObject->as<QV4::VariantObject>();
     if (o) {
         QVariant v = o->d()->data();
-        switch (v.type()) {
-        case QVariant::Invalid:
+        switch (v.userType()) {
+        case QMetaType::UnknownType:
             return Encode::undefined();
-        case QVariant::String:
+        case QMetaType::QString:
             return Encode(b->engine()->newString(v.toString()));
-        case QVariant::Int:
+        case QMetaType::Int:
             return Encode(v.toInt());
-        case QVariant::Double:
-        case QVariant::UInt:
+        case QMetaType::Double:
+        case QMetaType::UInt:
             return Encode(v.toDouble());
-        case QVariant::Bool:
+        case QMetaType::Bool:
             return Encode(v.toBool());
         default:
-            if (QMetaType::typeFlags(v.userType()) & QMetaType::IsEnumeration)
-                RETURN_RESULT(Encode(v.toInt()));
+            if (QMetaType(v.metaType()).flags() & QMetaType::IsEnumeration)
+                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;
         }
     }