From 32c39330ef3b7a7adc00ab955549ab3a4742352c Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Tue, 29 May 2012 05:15:53 +0300 Subject: 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 --- src/gui/text/qtextengine.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui/text/qtextengine.cpp') 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(layoutData->string.constData()), - layoutData->string.length(), - hbScriptItems.data(), hbScriptItems.size(), - (HB_CharAttributes *)layoutData->memory); + QUnicodeTools::initCharAttributes(reinterpret_cast(layoutData->string.constData()), + layoutData->string.length(), + hbScriptItems.data(), hbScriptItems.size(), + (HB_CharAttributes *)layoutData->memory); layoutData->haveCharAttributes = true; -- cgit v1.2.3