From d84105e71f37e181714ed8885b360de5b9c3d243 Mon Sep 17 00:00:00 2001 From: Igor Khanin Date: Sun, 21 Jul 2024 13:57:42 +0300 Subject: [PATCH] Fixup QTextOption enum formatting Add missing trailing space, and change to newer "since Qt version" format for relevant enum values. Pick-to: 6.7 6.5 Change-Id: Iffe959545d9d608a65c41c8d3ad56f16468cfa73 Reviewed-by: Christian Ehrlicher (cherry picked from commit f7d1d5cb0110552c276ff7a4d8bfb79bf1129c87) Reviewed-by: Qt Cherry-pick Bot --- src/gui/text/qtextoption.cpp | 3 +-- src/gui/text/qtextoption.h | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp index b6beadbe914..ea1b556f081 100644 --- a/src/gui/text/qtextoption.cpp +++ b/src/gui/text/qtextoption.cpp @@ -267,8 +267,7 @@ QList QTextOption::tabs() const \value ShowTabsAndSpaces Visualize spaces with little dots, and tabs with little arrows. Non-breaking spaces are shown differently to breaking spaces. \value ShowLineAndParagraphSeparators Visualize line and paragraph separators with appropriate symbol characters. - \value ShowDocumentTerminator Visualize the end of the document with a section sign. This enum value was added - in Qt 5.7. + \value [since 5.7] ShowDocumentTerminator Visualize the end of the document with a section sign. \value AddSpaceForLineAndParagraphSeparators While determining the line-break positions take into account the space added for drawing a separator character. \value SuppressColors Suppress all color changes in the character formats (except the main selection). diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h index dcff41584f0..f0a385ff50f 100644 --- a/src/gui/text/qtextoption.h +++ b/src/gui/text/qtextoption.h @@ -62,7 +62,7 @@ public: WordWrap, ManualWrap, WrapAnywhere, - WrapAtWordBoundaryOrAnywhere + WrapAtWordBoundaryOrAnywhere, }; inline void setWrapMode(WrapMode wrap) { wordWrap = wrap; } inline WrapMode wrapMode() const { return static_cast(wordWrap); } @@ -73,7 +73,7 @@ public: AddSpaceForLineAndParagraphSeparators = 0x4, SuppressColors = 0x8, ShowDocumentTerminator = 0x10, - IncludeTrailingSpaces = 0x80000000 + IncludeTrailingSpaces = 0x80000000, }; Q_DECLARE_FLAGS(Flags, Flag) inline void setFlags(Flags flags);