diff options
Diffstat (limited to 'src/quick/items/qquickcolorgroup_p.h')
| -rw-r--r-- | src/quick/items/qquickcolorgroup_p.h | 59 |
1 files changed, 18 insertions, 41 deletions
diff --git a/src/quick/items/qquickcolorgroup_p.h b/src/quick/items/qquickcolorgroup_p.h index 9d60c9aef2..202bba7ee1 100644 --- a/src/quick/items/qquickcolorgroup_p.h +++ b/src/quick/items/qquickcolorgroup_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: http://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) 2020 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 QQUICKCOLORGROUP_H #define QQUICKCOLORGROUP_H @@ -58,12 +22,14 @@ #include <QtQml/qqml.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickPalette; class QQuickPaletteColorProvider; -class Q_QUICK_PRIVATE_EXPORT QQuickColorGroup : public QObject +class Q_QUICK_EXPORT QQuickColorGroup : public QObject { Q_OBJECT @@ -86,6 +52,9 @@ class Q_QUICK_PRIVATE_EXPORT QQuickColorGroup : public QObject Q_PROPERTY(QColor toolTipText READ toolTipText WRITE setToolTipText RESET resetToolTipText NOTIFY toolTipTextChanged FINAL) Q_PROPERTY(QColor window READ window WRITE setWindow RESET resetWindow NOTIFY windowChanged FINAL) Q_PROPERTY(QColor windowText READ windowText WRITE setWindowText RESET resetWindowText NOTIFY windowTextChanged FINAL) + Q_PROPERTY(QColor placeholderText READ placeholderText WRITE setPlaceholderText + RESET resetPlaceholderText NOTIFY placeholderTextChanged REVISION(6, 2) FINAL) + Q_PROPERTY(QColor accent READ accent WRITE setAccent RESET resetAccent NOTIFY accentChanged REVISION(6, 6) FINAL) QML_NAMED_ELEMENT(ColorGroup) QML_ADDED_IN_VERSION(6, 0) @@ -174,6 +143,14 @@ public: void setWindowText(const QColor &color); void resetWindowText(); + QColor placeholderText() const; + void setPlaceholderText(const QColor &color); + void resetPlaceholderText(); + + QColor accent() const; + void setAccent(const QColor &color); + void resetAccent(); + QPalette::ColorGroup groupTag() const; void setGroupTag(QPalette::ColorGroup tag); @@ -202,6 +179,8 @@ Q_SIGNALS: void toolTipTextChanged(); void windowChanged(); void windowTextChanged(); + Q_REVISION(6, 2) void placeholderTextChanged(); + Q_REVISION(6, 6) void accentChanged(); void changed(); @@ -226,6 +205,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickColorGroup) - #endif // QQUICKCOLORGROUP_H |