Update Qt internals to use QChar::Script

...and remove the outdated QUnicodeTables::Script enum.
QFontEngineData now has one extra slot that never used
(engines[QChar::Script_Inherited]). engines[QChar::Script_Unknown],
if accessed, would be set with a Box engine instance, and could be used
as a minor optimization some time later.

In order to preserve the existing behavior, we map all scripts up to Latin to Common.

Change-Id: Ide4182a0f8447b4bf25713ecc3fe8097b8fed040
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>

1 files changed, 0 insertions, 35 deletions

diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
index 85188c435f..2fdd680639 100644
--- a/tests/auto/corelib/tools/qchar/tst_qchar.cpp
+++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
@@ -709,41 +709,6 @@ void tst_QChar::lineBreakClass()
 
 void tst_QChar::script()
 {
-    QVERIFY(QUnicodeTables::script(0x0020u) == QUnicodeTables::Common);
-    QVERIFY(QUnicodeTables::script(0x0041u) == QUnicodeTables::Common); // ### Latin
-    QVERIFY(QUnicodeTables::script(0x0375u) == QUnicodeTables::Greek);
-    QVERIFY(QUnicodeTables::script(0x0400u) == QUnicodeTables::Cyrillic);
-    QVERIFY(QUnicodeTables::script(0x0531u) == QUnicodeTables::Armenian);
-    QVERIFY(QUnicodeTables::script(0x0591u) == QUnicodeTables::Hebrew);
-    QVERIFY(QUnicodeTables::script(0x0600u) == QUnicodeTables::Arabic);
-    QVERIFY(QUnicodeTables::script(0x0700u) == QUnicodeTables::Syriac);
-    QVERIFY(QUnicodeTables::script(0x0780u) == QUnicodeTables::Thaana);
-    QVERIFY(QUnicodeTables::script(0x07c0u) == QUnicodeTables::Nko);
-    QVERIFY(QUnicodeTables::script(0x0900u) == QUnicodeTables::Devanagari);
-    QVERIFY(QUnicodeTables::script(0x0981u) == QUnicodeTables::Bengali);
-    QVERIFY(QUnicodeTables::script(0x0a01u) == QUnicodeTables::Gurmukhi);
-    QVERIFY(QUnicodeTables::script(0x0a81u) == QUnicodeTables::Gujarati);
-    QVERIFY(QUnicodeTables::script(0x0b01u) == QUnicodeTables::Oriya);
-    QVERIFY(QUnicodeTables::script(0x0b82u) == QUnicodeTables::Tamil);
-    QVERIFY(QUnicodeTables::script(0x0c01u) == QUnicodeTables::Telugu);
-    QVERIFY(QUnicodeTables::script(0x0c82u) == QUnicodeTables::Kannada);
-    QVERIFY(QUnicodeTables::script(0x0d02u) == QUnicodeTables::Malayalam);
-    QVERIFY(QUnicodeTables::script(0x0d82u) == QUnicodeTables::Sinhala);
-    QVERIFY(QUnicodeTables::script(0x0e01u) == QUnicodeTables::Thai);
-    QVERIFY(QUnicodeTables::script(0x0e81u) == QUnicodeTables::Lao);
-    QVERIFY(QUnicodeTables::script(0x0f00u) == QUnicodeTables::Tibetan);
-    QVERIFY(QUnicodeTables::script(0x1000u) == QUnicodeTables::Myanmar);
-    QVERIFY(QUnicodeTables::script(0x10a0u) == QUnicodeTables::Georgian);
-    QVERIFY(QUnicodeTables::script(0x1100u) == QUnicodeTables::Hangul);
-    QVERIFY(QUnicodeTables::script(0x1680u) == QUnicodeTables::Ogham);
-    QVERIFY(QUnicodeTables::script(0x16a0u) == QUnicodeTables::Runic);
-    QVERIFY(QUnicodeTables::script(0x1780u) == QUnicodeTables::Khmer);
-    QVERIFY(QUnicodeTables::script(0x200cu) == QUnicodeTables::Inherited);
-    QVERIFY(QUnicodeTables::script(0x200du) == QUnicodeTables::Inherited);
-    QVERIFY(QUnicodeTables::script(0x1018au) == QUnicodeTables::Greek);
-    QVERIFY(QUnicodeTables::script(0x1f130u) == QUnicodeTables::Common);
-    QVERIFY(QUnicodeTables::script(0xe0100u) == QUnicodeTables::Inherited);
-
     QVERIFY(QChar::script(0x0020u) == QChar::Script_Common);
     QVERIFY(QChar::script(0x0041u) == QChar::Script_Latin);
     QVERIFY(QChar::script(0x0375u) == QChar::Script_Greek);