diff options
Diffstat (limited to 'src/qml/qml/qqmlvaluetype.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvaluetype.cpp | 103 |
1 files changed, 34 insertions, 69 deletions
diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp index e1f56d0d59..4088d6e6c4 100644 --- a/src/qml/qml/qqmlvaluetype.cpp +++ b/src/qml/qml/qqmlvaluetype.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** 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 "qqmlvaluetype_p.h" @@ -47,17 +11,9 @@ QT_BEGIN_NAMESPACE -QQmlValueType::QQmlValueType(int typeId, const QMetaObject *gadgetMetaObject) - : metaType(typeId) -{ - QMetaObjectBuilder builder(gadgetMetaObject); - dynamicMetaObject = builder.toMetaObject(); - *static_cast<QMetaObject*>(this) = *dynamicMetaObject; -} - QQmlValueType::~QQmlValueType() { - ::free(dynamicMetaObject); + ::free(m_dynamicMetaObject); } QQmlGadgetPtrWrapper *QQmlGadgetPtrWrapper::instance(QQmlEngine *engine, QMetaType type) @@ -87,33 +43,43 @@ void QQmlGadgetPtrWrapper::read(QObject *obj, int idx) QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a); } -void QQmlGadgetPtrWrapper::write(QObject *obj, int idx, QQmlPropertyData::WriteFlags flags) +void QQmlGadgetPtrWrapper::write( + QObject *obj, int idx, QQmlPropertyData::WriteFlags flags, int internalIndex) const { Q_ASSERT(m_gadgetPtr); int status = -1; - void *a[] = { m_gadgetPtr, nullptr, &status, &flags }; + void *a[] = { m_gadgetPtr, nullptr, &status, &flags, &internalIndex }; QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a); } -QVariant QQmlGadgetPtrWrapper::value() +QVariant QQmlGadgetPtrWrapper::value() const { Q_ASSERT(m_gadgetPtr); - return QVariant(QMetaType(metaTypeId()), m_gadgetPtr); + + const QMetaType m = metaType(); + return m == QMetaType::fromType<QVariant>() + ? *static_cast<const QVariant *>(m_gadgetPtr) + : QVariant(m, m_gadgetPtr); } void QQmlGadgetPtrWrapper::setValue(const QVariant &value) { Q_ASSERT(m_gadgetPtr); - Q_ASSERT(metaTypeId() == value.userType()); - const QQmlValueType *type = valueType(); - type->destruct(m_gadgetPtr); - type->construct(m_gadgetPtr, value.constData()); + + const QMetaType m = metaType(); + m.destruct(m_gadgetPtr); + if (m == QMetaType::fromType<QVariant>()) { + m.construct(m_gadgetPtr, &value); + } else { + Q_ASSERT(m == value.metaType()); + m.construct(m_gadgetPtr, value.constData()); + } } int QQmlGadgetPtrWrapper::metaCall(QMetaObject::Call type, int id, void **argv) { Q_ASSERT(m_gadgetPtr); - const QMetaObject *metaObject = valueType(); + const QMetaObject *metaObject = valueType()->staticMetaObject(); QQmlMetaObject::resolveGadgetMethodOrPropertyIndex(type, &metaObject, &id); metaObject->d.static_metacall(static_cast<QObject *>(m_gadgetPtr), type, id, argv); return id; @@ -125,9 +91,18 @@ const QQmlValueType *QQmlGadgetPtrWrapper::valueType() const return static_cast<const QQmlValueType *>(d->metaObject); } -QAbstractDynamicMetaObject *QQmlValueType::toDynamicMetaObject(QObject *) +QMetaObject *QQmlValueType::toDynamicMetaObject(QObject *) { - return this; + if (!m_dynamicMetaObject) { + QMetaObjectBuilder builder(m_staticMetaObject); + + // Do not set PropertyAccessInStaticMetaCall here. QQmlGadgetPtrWrapper likes to + // to intercept the metacalls since it needs to use its gadgetPtr. + // For QQmlValueType::metaObject() we use the base type that has the flag. + + m_dynamicMetaObject = builder.toMetaObject(); + } + return m_dynamicMetaObject; } void QQmlValueType::objectDestroyed(QObject *) @@ -419,7 +394,7 @@ void QQmlEasingValueType::setBezierCurve(const QVariantList &customCurveVariant) if (customCurveVariant.isEmpty()) return; - if ((customCurveVariant.count() % 6) != 0) + if ((customCurveVariant.size() % 6) != 0) return; auto convert = [](const QVariant &v, qreal &r) { @@ -448,16 +423,6 @@ void QQmlEasingValueType::setBezierCurve(const QVariantList &customCurveVariant) v = newEasingCurve; } -QObject *QQmlPropertyValueType::object() const -{ - return v.object(); -} - -QString QQmlPropertyValueType::name() const -{ - return v.name(); -} - QVariantList QQmlEasingValueType::bezierCurve() const { QVariantList rv; |