1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixup QTextOption enum formatting

Browse Source 
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 <ch.ehrlicher@gmx.de>
(cherry picked from commit f7d1d5cb0110552c276ff7a4d8bfb79bf1129c87)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Igor Khanin 2024-07-21 13:57:42 +03:00 committed by Qt Cherry-pick Bot
parent 334a83e4a7
commit d84105e71f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/text/qtextoption.cpp
View File

@ -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 \value ShowTabsAndSpaces Visualize spaces with little dots, and tabs with little arrows. Non-breaking spaces are
shown differently to breaking spaces. shown differently to breaking spaces.
\value ShowLineAndParagraphSeparators Visualize line and paragraph separators with appropriate symbol characters. \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 \value [since 5.7] ShowDocumentTerminator Visualize the end of the document with a section sign.
in Qt 5.7.
\value AddSpaceForLineAndParagraphSeparators While determining the line-break positions take into account the \value AddSpaceForLineAndParagraphSeparators While determining the line-break positions take into account the
space added for drawing a separator character. space added for drawing a separator character.
\value SuppressColors Suppress all color changes in the character formats (except the main selection). \value SuppressColors Suppress all color changes in the character formats (except the main selection).

4
src/gui/text/qtextoption.h
View File

@ -62,7 +62,7 @@ public:
WordWrap, WordWrap,
ManualWrap, ManualWrap,
WrapAnywhere, WrapAnywhere,
WrapAtWordBoundaryOrAnywhere WrapAtWordBoundaryOrAnywhere,
}; };
inline void setWrapMode(WrapMode wrap) { wordWrap = wrap; } inline void setWrapMode(WrapMode wrap) { wordWrap = wrap; }
inline WrapMode wrapMode() const { return static_cast<WrapMode>(wordWrap); } inline WrapMode wrapMode() const { return static_cast<WrapMode>(wordWrap); }
@ -73,7 +73,7 @@ public:
AddSpaceForLineAndParagraphSeparators = 0x4, AddSpaceForLineAndParagraphSeparators = 0x4,
SuppressColors = 0x8, SuppressColors = 0x8,
ShowDocumentTerminator = 0x10, ShowDocumentTerminator = 0x10,
IncludeTrailingSpaces = 0x80000000 IncludeTrailingSpaces = 0x80000000,
}; };
Q_DECLARE_FLAGS(Flags, Flag) Q_DECLARE_FLAGS(Flags, Flag)
inline void setFlags(Flags flags); inline void setFlags(Flags flags);