From 7922cd5272f84ca4180d6ebb45e5a81a45d14a92 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 17 Jul 2019 11:36:35 -0700 Subject: QChar: add FormFeed (FF) special character [ChangeLog][QtCore][QChar] Added FormFeed (FF) special character. Fixes: QTBUG-77089 Change-Id: I1024ee42da0c4323953afffd15b245a508f545f0 Reviewed-by: Edward Welbourne --- src/corelib/text/qchar.cpp | 1 + src/corelib/text/qchar.h | 1 + tests/manual/diaglib/textdump.cpp | 3 +++ 3 files changed, 5 insertions(+) diff --git a/src/corelib/text/qchar.cpp b/src/corelib/text/qchar.cpp index 0c190c6a3d..7dd353b4ba 100644 --- a/src/corelib/text/qchar.cpp +++ b/src/corelib/text/qchar.cpp @@ -572,6 +572,7 @@ QT_BEGIN_NAMESPACE \value Null A QChar with this value isNull(). \value Tabulation Character tabulation. \value LineFeed + \value FormFeed \value CarriageReturn \value Space \value Nbsp Non-breaking space. diff --git a/src/corelib/text/qchar.h b/src/corelib/text/qchar.h index e028a24c24..f67a7ea90a 100644 --- a/src/corelib/text/qchar.h +++ b/src/corelib/text/qchar.h @@ -78,6 +78,7 @@ public: Null = 0x0000, Tabulation = 0x0009, LineFeed = 0x000a, + FormFeed = 0x000c, CarriageReturn = 0x000d, Space = 0x0020, Nbsp = 0x00a0, diff --git a/tests/manual/diaglib/textdump.cpp b/tests/manual/diaglib/textdump.cpp index 8bb899783b..383ec4edb0 100644 --- a/tests/manual/diaglib/textdump.cpp +++ b/tests/manual/diaglib/textdump.cpp @@ -44,6 +44,9 @@ static const EnumLookup specialCharactersEnumLookup[] = #if QT_VERSION >= 0x050000 {QChar::Tabulation, "Tabulation"}, {QChar::LineFeed, "LineFeed"}, +# if QT_VERSION >= 0x050e00 + {QChar::FormFeed, "FormFeed"}, +# endif {QChar::CarriageReturn, "CarriageReturn"}, {QChar::Space, "Space"}, #endif -- cgit v1.2.3