diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-05-29 05:15:53 +0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-30 01:54:45 +0200 |
commit | 32c39330ef3b7a7adc00ab955549ab3a4742352c (patch) | |
tree | 6361b872d9c4f8dfa5eef9f4484374c7734392c6 /src/gui/text/qtextengine.cpp | |
parent | c16455dbcf7aae140524b391c99b97a7b10b41dc (diff) |
Introduce QUnicodeTools
Add QUnicodeTools namespace and rename qGetCharAttributes to initCharAttributes;
Make it possible to disable tailoring globally by overriding
qt_initcharattributes_default_algorithm_only value
(useful for i.e. running the specification conformance tests);
This is mostly a preparation step for the upcoming patches.
Change-Id: I783879fd17b63b52d7983e25dad5b820f0515e7f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui/text/qtextengine.cpp')
-rw-r--r-- | src/gui/text/qtextengine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 637fab42de..dbf1b457f6 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1214,10 +1214,10 @@ const HB_CharAttributes *QTextEngine::attributes() const hbScriptItems[i].script = (HB_Script)si.analysis.script; } - qGetCharAttributes(reinterpret_cast<const HB_UChar16 *>(layoutData->string.constData()), - layoutData->string.length(), - hbScriptItems.data(), hbScriptItems.size(), - (HB_CharAttributes *)layoutData->memory); + QUnicodeTools::initCharAttributes(reinterpret_cast<const HB_UChar16 *>(layoutData->string.constData()), + layoutData->string.length(), + hbScriptItems.data(), hbScriptItems.size(), + (HB_CharAttributes *)layoutData->memory); layoutData->haveCharAttributes = true; |