diff options
Diffstat (limited to 'src/quick/items/qquicktext_p.h')
| -rw-r--r-- | src/quick/items/qquicktext_p.h | 72 |
1 files changed, 21 insertions, 51 deletions
diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h index 304b82b914..ed474b29c0 100644 --- a/src/quick/items/qquicktext_p.h +++ b/src/quick/items/qquicktext_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 QQUICKTEXT_P_H #define QQUICKTEXT_P_H @@ -52,6 +16,7 @@ // #include "qquickimplicitsizeitem_p.h" +#include "qquicktextinterface_p.h" #include <private/qtquickglobal_p.h> #include <QtGui/qtextoption.h> @@ -59,9 +24,10 @@ QT_BEGIN_NAMESPACE class QQuickTextPrivate; class QQuickTextLine; -class Q_QUICK_PRIVATE_EXPORT QQuickText : public QQuickImplicitSizeItem +class Q_QUICK_EXPORT QQuickText : public QQuickImplicitSizeItem, public QQuickTextInterface { Q_OBJECT + Q_INTERFACES(QQuickTextInterface) Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged) Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) @@ -143,7 +109,8 @@ public: Q_ENUM(WrapMode) enum RenderType { QtRendering, - NativeRendering + NativeRendering, + CurveRendering }; Q_ENUM(RenderType) @@ -274,6 +241,8 @@ public: QJSValue fontInfo() const; QSizeF advance() const; + void invalidate() override; + Q_SIGNALS: void textChanged(const QString &text); void linkActivated(const QString &link); @@ -332,6 +301,8 @@ protected: private Q_SLOTS: void q_updateLayout(); void triggerPreprocess(); + Q_REVISION(6, 7) QVariant loadResource(int type, const QUrl &source); + void resourceRequestFinished(); void imageDownloadFinished(); private: @@ -339,17 +310,19 @@ private: Q_DECLARE_PRIVATE(QQuickText) }; +Q_DECLARE_MIXED_ENUM_OPERATORS_SYMMETRIC(int, QQuickText::HAlignment, QQuickText::VAlignment) + class QTextLine; -class QQuickTextLine : public QObject +class Q_QUICK_EXPORT QQuickTextLine : public QObject { Q_OBJECT - Q_PROPERTY(int number READ number) - Q_PROPERTY(qreal width READ width WRITE setWidth) - Q_PROPERTY(qreal height READ height WRITE setHeight) - Q_PROPERTY(qreal x READ x WRITE setX) - Q_PROPERTY(qreal y READ y WRITE setY) - Q_PROPERTY(qreal implicitWidth READ implicitWidth REVISION(2, 15)) - Q_PROPERTY(bool isLast READ isLast REVISION(2, 15)) + Q_PROPERTY(int number READ number FINAL) + Q_PROPERTY(qreal width READ width WRITE setWidth FINAL) + Q_PROPERTY(qreal height READ height WRITE setHeight FINAL) + Q_PROPERTY(qreal x READ x WRITE setX FINAL) + Q_PROPERTY(qreal y READ y WRITE setY FINAL) + Q_PROPERTY(qreal implicitWidth READ implicitWidth REVISION(2, 15) FINAL) + Q_PROPERTY(bool isLast READ isLast REVISION(2, 15) FINAL) QML_ANONYMOUS QML_ADDED_IN_VERSION(2, 0) @@ -384,7 +357,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickText) -QML_DECLARE_TYPE(QQuickTextLine) - #endif // QQUICKTEXT_P_H |