diff options
Diffstat (limited to 'src/quick/items/qquickaccessibleattached_p.h')
| -rw-r--r-- | src/quick/items/qquickaccessibleattached_p.h | 51 |
1 files changed, 7 insertions, 44 deletions
diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h index c4ccbb5a10..92d1307a9a 100644 --- a/src/quick/items/qquickaccessibleattached_p.h +++ b/src/quick/items/qquickaccessibleattached_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 QQUICKACCESSIBLEATTACHED_H #define QQUICKACCESSIBLEATTACHED_H @@ -73,7 +37,7 @@ QT_BEGIN_NAMESPACE if (m_state.P == arg) \ return; \ m_state.P = arg; \ - emit P ## Changed(arg); \ + Q_EMIT P ## Changed(arg); \ QAccessible::State changedState; \ changedState.P = true; \ QAccessibleStateChangeEvent ev(parent(), changedState); \ @@ -81,8 +45,7 @@ QT_BEGIN_NAMESPACE } \ Q_SIGNAL void P ## Changed(bool arg); - -class Q_QUICK_PRIVATE_EXPORT QQuickAccessibleAttached : public QObject +class Q_QUICK_EXPORT QQuickAccessibleAttached : public QObject { Q_OBJECT Q_PROPERTY(QAccessible::Role role READ role WRITE setRole NOTIFY roleChanged FINAL) @@ -94,9 +57,9 @@ class Q_QUICK_PRIVATE_EXPORT QQuickAccessibleAttached : public QObject QML_ADDED_IN_VERSION(2, 0) QML_UNCREATABLE("Accessible is only available via attached properties.") QML_ATTACHED(QQuickAccessibleAttached) + QML_EXTENDED_NAMESPACE(QAccessible) public: - Q_ENUMS(QAccessible::Role QAccessible::Event) STATE_PROPERTY(checkable) STATE_PROPERTY(checked) STATE_PROPERTY(editable) @@ -190,6 +153,8 @@ public: bool doAction(const QString &actionName); void availableActions(QStringList *actions) const; + Q_REVISION(6, 2) Q_INVOKABLE static QString stripHtml(const QString &html); + public Q_SLOTS: void valueChanged() { QAccessibleValueChangeEvent ev(parent(), parent()->property("value")); @@ -246,8 +211,6 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickAccessibleAttached) - #endif // accessibility #endif |