diff options
Diffstat (limited to 'src/quick/designer/qquickdesignercustomobjectdata_p.h')
| -rw-r--r-- | src/quick/designer/qquickdesignercustomobjectdata_p.h | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/src/quick/designer/qquickdesignercustomobjectdata_p.h b/src/quick/designer/qquickdesignercustomobjectdata_p.h index 8e036d586a..86b96d1ef2 100644 --- a/src/quick/designer/qquickdesignercustomobjectdata_p.h +++ b/src/quick/designer/qquickdesignercustomobjectdata_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQuick 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 DESIGNERCUSTOMOBJECTDATA_H #define DESIGNERCUSTOMOBJECTDATA_H @@ -57,7 +21,7 @@ #include <QObject> #include <QVariant> -#include <private/qqmlbinding_p.h> +#include <private/qqmlanybinding_p.h> QT_BEGIN_NAMESPACE class QQmlContext; @@ -90,14 +54,14 @@ private: QVariant getResetValue(const QQuickDesignerSupport::PropertyName &propertyName) const; void doResetProperty(QQmlContext *context, const QQuickDesignerSupport::PropertyName &propertyName); bool hasValidResetBinding(const QQuickDesignerSupport::PropertyName &propertyName) const; - QQmlAbstractBinding *getResetBinding(const QQuickDesignerSupport::PropertyName &propertyName) const; + QQmlAnyBinding getResetBinding(const QQuickDesignerSupport::PropertyName &propertyName) const; bool hasBindingForProperty(QQmlContext *context, const QQuickDesignerSupport::PropertyName &propertyName, bool *hasChanged) const; void setPropertyBinding(QQmlContext *context, const QQuickDesignerSupport::PropertyName &propertyName, const QString &expression); void keepBindingFromGettingDeleted(QQmlContext *context, const QQuickDesignerSupport::PropertyName &propertyName); QObject *m_object; QHash<QQuickDesignerSupport::PropertyName, QVariant> m_resetValueHash; - QHash<QQuickDesignerSupport::PropertyName, QQmlAbstractBinding::Ptr> m_resetBindingHash; + QHash<QQuickDesignerSupport::PropertyName, QQmlAnyBinding> m_resetBindingHash; mutable QHash<QQuickDesignerSupport::PropertyName, bool> m_hasBindingHash; }; |