diff options
Diffstat (limited to 'src/qml/qml/qqmlproperty.h')
| -rw-r--r-- | src/qml/qml/qqmlproperty.h | 55 |
1 files changed, 16 insertions, 39 deletions
diff --git a/src/qml/qml/qqmlproperty.h b/src/qml/qml/qqmlproperty.h index aa455101dc..0878034bab 100644 --- a/src/qml/qml/qqmlproperty.h +++ b/src/qml/qml/qqmlproperty.h @@ -1,47 +1,14 @@ -/**************************************************************************** -** -** 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 #ifndef QQMLPROPERTY_H #define QQMLPROPERTY_H +#include <QtCore/qstring.h> +#include <QtCore/qhashfunctions.h> #include <QtQml/qtqmlglobal.h> #include <QtCore/qmetaobject.h> +#include <QtQml/qqmlregistration.h> QT_BEGIN_NAMESPACE @@ -54,6 +21,12 @@ class QQmlEngine; class QQmlPropertyPrivate; class Q_QML_EXPORT QQmlProperty { + Q_GADGET + QML_ANONYMOUS + QML_ADDED_IN_VERSION(2, 15) + + Q_PROPERTY(QObject *object READ object CONSTANT FINAL) + Q_PROPERTY(QString name READ name CONSTANT FINAL) public: enum PropertyTypeCategory { InvalidCategory, @@ -82,6 +55,10 @@ public: QQmlProperty(const QQmlProperty &); QQmlProperty &operator=(const QQmlProperty &); + QQmlProperty(QQmlProperty &&other) noexcept : d(std::exchange(other.d, nullptr)) {} + QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QQmlProperty) + + void swap(QQmlProperty &other) noexcept { qt_ptr_swap(d, other.d); } bool operator==(const QQmlProperty &) const; Type type() const; @@ -125,7 +102,7 @@ public: private: friend class QQmlPropertyPrivate; - QQmlPropertyPrivate *d; + QQmlPropertyPrivate *d = nullptr; }; typedef QList<QQmlProperty> QQmlProperties; |