summaryrefslogtreecommitdiffstats
path: root/src/corelib/text/qunicodetools_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-03-14 15:23:31 +0100
committerLars Knoll <lars.knoll@qt.io>2020-03-17 01:42:58 +0100
commitdd7d8304bbe599320b163b94e9a4ad9a6f35b740 (patch)
tree9a27d9c39dd72667b402cbb01d9b3f71e6c0e9c6 /src/corelib/text/qunicodetools_p.h
parent76ced3f179f18f5f28416291140f5804c8a905b9 (diff)
Remove harfbuzz dependency from qunicodetools
Copy the relevant harfbuzz code over from Harfbuzz into qunicodetools.cpp This is basically the attribute functions from the different harfbuzz shapers. Those methods do not require any font support but operate purely on unicode input data. Adjusted the code to use Qt's own data structures and enums (QChar::Script and friends) instead of the harfbuzz equivalents. The code is 100% copyright The Qt Company, so we can do this without requiring any attribution. Change-Id: I8262ba34eae1837f031f07d1b6d9917c0224e160 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/corelib/text/qunicodetools_p.h')
-rw-r--r--src/corelib/text/qunicodetools_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/text/qunicodetools_p.h b/src/corelib/text/qunicodetools_p.h
index 6294d9ceb4..5715444025 100644
--- a/src/corelib/text/qunicodetools_p.h
+++ b/src/corelib/text/qunicodetools_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtCore module of the Qt Toolkit.
@@ -75,7 +75,7 @@ namespace QUnicodeTools {
struct ScriptItem
{
int position;
- int script;
+ QChar::Script script;
};
using ScriptItemArray = QVarLengthArray<ScriptItem, 64>;