diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 09:49:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 09:49:01 (GMT) |
| commit | 5de30ecf4c28279fe8eed0ed8cb53504eb1350d7 (patch) | |
| tree | 49af06e86b70d06ea090077f68931877c36e0ff9 /tests | |
| parent | 5b6933ae8e2bb8b3ca33ef7f31ba564b4cb53bec (diff) | |
| parent | f2e723839b4067581fc2974a29aebdd41cb881f6 (diff) | |
| download | Qt-5de30ecf4c28279fe8eed0ed8cb53504eb1350d7.zip Qt-5de30ecf4c28279fe8eed0ed8cb53504eb1350d7.tar.gz Qt-5de30ecf4c28279fe8eed0ed8cb53504eb1350d7.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fix static text item positioning GL2 paint engine
Fix combining marks handling in Core Text shaper
Fix PBuffer example to work again
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp index 91d0f3f..4f4e706a 100644 --- a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp +++ b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp @@ -56,7 +56,7 @@ -#if defined(Q_WS_X11) +#if defined(Q_WS_X11) || defined(Q_WS_MAC) #define private public #include <private/qtextengine_p.h> #include <qtextlayout.h> @@ -104,6 +104,7 @@ private slots: void khmer(); void linearB(); void controlInSyllable_qtbug14204(); + void combiningMarks_qtbug15675(); }; tst_QTextScriptEngine::tst_QTextScriptEngine() @@ -1133,5 +1134,27 @@ void tst_QTextScriptEngine::controlInSyllable_qtbug14204() #endif } +void tst_QTextScriptEngine::combiningMarks_qtbug15675() +{ +#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA) + QString s; + s.append(QChar(0x0061)); + s.append(QChar(0x0062)); + s.append(QChar(0x0300)); + s.append(QChar(0x0063)); + + QFont font("Monaco"); + QTextLayout layout(s, font); + QTextEngine *e = layout.d; + e->itemize(); + e->shape(0); + + QVERIFY(e->layoutData->items[0].num_glyphs == 4); + QVERIFY(e->layoutData->glyphLayout.advances_y[2] > 0); +#else + QSKIP("Mac specific test", SkipAll); +#endif +} + QTEST_MAIN(tst_QTextScriptEngine) #include "tst_qtextscriptengine.moc" |