summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/harfbuzz/src/harfbuzz-external.h2
-rw-r--r--src/corelib/tools/qchar.cpp4
-rw-r--r--src/corelib/tools/qchar.h2
3 files changed, 1 insertions, 7 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-external.h b/src/3rdparty/harfbuzz/src/harfbuzz-external.h
index 7644f0dd43..5fff35fe50 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-external.h
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-external.h
@@ -52,8 +52,6 @@ typedef enum {
typedef enum
{
- HB_NoCategory,
-
HB_Mark_NonSpacing, /* Mn */
HB_Mark_SpacingCombining, /* Mc */
HB_Mark_Enclosing, /* Me */
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp
index 475bd55de4..89f19b40e6 100644
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/tools/qchar.cpp
@@ -259,8 +259,6 @@ QT_BEGIN_NAMESPACE
\value Symbol_Other Unicode class name So
- \value NoCategory Qt cannot find an appropriate category for the character.
-
\omitvalue Punctuation_Dask
\sa category()
@@ -764,7 +762,7 @@ QChar::Category QChar::category() const
QChar::Category QChar::category(uint ucs4)
{
if (ucs4 > UNICODE_LAST_CODEPOINT)
- return QChar::NoCategory;
+ return QChar::Other_NotAssigned;
return (QChar::Category) qGetProp(ucs4)->category;
}
diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h
index d6db72d5ac..277c2987ce 100644
--- a/src/corelib/tools/qchar.h
+++ b/src/corelib/tools/qchar.h
@@ -93,8 +93,6 @@ public:
enum Category
{
- NoCategory, // ### Qt 5: replace with Other_NotAssigned
-
Mark_NonSpacing, // Mn
Mark_SpacingCombining, // Mc
Mark_Enclosing, // Me