diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-03-16 09:34:01 +0100 |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-03-16 12:06:41 +0100 |
| commit | ed218edcf3d40e05b7cc9e1b895b7dad662e0511 (patch) | |
| tree | 37876001ce9438f242700fd17555599cba4b9eea /src/gui/text/qfontengine_coretext.mm | |
| parent | f673f4c8273bcdde76b36cb58cb7b5e46a87f1ac (diff) | |
Only enable RightToLeft forcing in OS X 10.6 and skip the test
Reviewed-by: Eskil
Diffstat (limited to 'src/gui/text/qfontengine_coretext.mm')
| -rw-r--r-- | src/gui/text/qfontengine_coretext.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_coretext.mm b/src/gui/text/qfontengine_coretext.mm index 52d24556ee..4d9192e3c1 100644 --- a/src/gui/text/qfontengine_coretext.mm +++ b/src/gui/text/qfontengine_coretext.mm @@ -128,6 +128,7 @@ bool QCoreTextFontEngineMulti::stringToCMap(const QChar *str, int len, QGlyphLay QCFType<CFAttributedStringRef> attributedString = CFAttributedStringCreate(0, cfstring, attributeDict); QCFType<CTTypesetterRef> typeSetter; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 if (flags & QTextEngine::RightToLeft) { const void *optionKeys[] = { kCTTypesetterOptionForcedEmbeddingLevel }; const short rtlForcedEmbeddingLevelValue = 1; @@ -136,6 +137,7 @@ bool QCoreTextFontEngineMulti::stringToCMap(const QChar *str, int len, QGlyphLay &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); typeSetter = CTTypesetterCreateWithAttributedStringAndOptions(attributedString, options); } else +#endif typeSetter = CTTypesetterCreateWithAttributedString(attributedString); CFRange range = {0, 0}; |