diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-03-18 07:21:47 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-04-02 11:34:24 +0000 |
| commit | 7d3c0a45b3f18f4f57e0a78297c7105bbcc5f9f8 (patch) | |
| tree | 11c54b413f54091b07af663d7151d4920f60f5a6 | |
| parent | 39bc38d85abef1d7a471a335cdec1773b19aa6e8 (diff) | |
QQuickText/Edit: fix C++20 -Wdeprecated-enum-enum-conversion warnings
Declare that HAlignment and VAlignment are designed to be mixed.
Change-Id: I97663653014856a3391e36dd1847b67603f6aac9
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit c34cdee53f81ad0d645468ebae7aa9d8cab79a3f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/quick/items/qquicktext_p.h | 2 | ||||
| -rw-r--r-- | src/quick/items/qquicktextedit_p.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h index 304b82b914..13d8579017 100644 --- a/src/quick/items/qquicktext_p.h +++ b/src/quick/items/qquicktext_p.h @@ -339,6 +339,8 @@ private: Q_DECLARE_PRIVATE(QQuickText) }; +Q_DECLARE_MIXED_ENUM_OPERATORS_SYMMETRIC(int, QQuickText::HAlignment, QQuickText::VAlignment) + class QTextLine; class QQuickTextLine : public QObject { diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index 41245f904e..7b43a847c1 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -422,6 +422,8 @@ private: Q_DECLARE_PRIVATE(QQuickTextEdit) }; +Q_DECLARE_MIXED_ENUM_OPERATORS_SYMMETRIC(int, QQuickTextEdit::HAlignment, QQuickTextEdit::VAlignment) + QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickTextEdit) |