diff options
Diffstat (limited to 'src/qml/qml/qqmlnotifier_p.h')
| -rw-r--r-- | src/qml/qml/qqmlnotifier_p.h | 57 |
1 files changed, 13 insertions, 44 deletions
diff --git a/src/qml/qml/qqmlnotifier_p.h b/src/qml/qml/qqmlnotifier_p.h index 67d80a9d86..0ec7d5fef2 100644 --- a/src/qml/qml/qqmlnotifier_p.h +++ b/src/qml/qml/qqmlnotifier_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 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 QQMLNOTIFIER_P_H #define QQMLNOTIFIER_P_H @@ -51,14 +15,15 @@ // We mean it. // -#include "qqmldata_p.h" #include <QtCore/qmetaobject.h> #include <private/qmetaobject_p.h> +#include <private/qtqmlglobal_p.h> QT_BEGIN_NAMESPACE class QQmlNotifierEndpoint; -class Q_QML_PRIVATE_EXPORT QQmlNotifier +class QQmlData; +class Q_QML_EXPORT QQmlNotifier { public: inline QQmlNotifier(); @@ -90,7 +55,8 @@ public: None = 0, QQmlBoundSignal = 1, QQmlJavaScriptExpressionGuard = 2, - QQmlVMEMetaObjectEndpoint = 3 + QQmlVMEMetaObjectEndpoint = 3, + QQmlPropertyGuard = 4, }; inline QQmlNotifierEndpoint(Callback callback); @@ -206,12 +172,15 @@ void QQmlNotifierEndpoint::disconnect() if (next) next->prev = prev; if (prev) *prev = next; - if (sourceSignal != -1) { + if (sourceSignal != -1 && needsConnectNotify) { QObject * const obj = senderAsObject(); Q_ASSERT(obj); QObjectPrivate * const priv = QObjectPrivate::get(obj); - if (needsConnectNotify) - priv->disconnectNotify(QMetaObjectPrivate::signal(obj->metaObject(), sourceSignal)); + + // In some degenerate cases an object being destructed might be unable + // to produce a metaObject(). Therefore we check here. + if (const QMetaObject *mo = obj->metaObject()) + priv->disconnectNotify(QMetaObjectPrivate::signal(mo, sourceSignal)); } setSender(0x0); |