summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Khanin <[email protected]>2024-07-21 13:57:42 +0300
committerChristian Ehrlicher <[email protected]>2024-07-21 17:42:03 +0000
commitf7d1d5cb0110552c276ff7a4d8bfb79bf1129c87 (patch)
tree972b9457107c15837e97bc4aefe9076282ade06d
parenta9ab406a69f4edc4228cc2effbcde309fcdcf411 (diff)
Fixup QTextOption enum formatting
Add missing trailing space, and change to newer "since Qt version" format for relevant enum values. Pick-to: 6.5 6.7 6.8 Change-Id: Iffe959545d9d608a65c41c8d3ad56f16468cfa73 Reviewed-by: Christian Ehrlicher <[email protected]>
-rw-r--r--src/gui/text/qtextoption.cpp3
-rw-r--r--src/gui/text/qtextoption.h4
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::Tab> 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<WrapMode>(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);