summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-11 08:41:33 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-11 08:41:33 (GMT)
commit5d15fe23559e88a61995ad4f0c19795869fc2a0a (patch)
tree8bc3a62f270aa9112f961d55e56860d3d738f061 /tests
parentb344f1933252ba34c73d03958550eb73746963e9 (diff)
parent0f0df28061c399d4d62a518e9a68ddbd1faa4de5 (diff)
downloadQt-5d15fe23559e88a61995ad4f0c19795869fc2a0a.zip
Qt-5d15fe23559e88a61995ad4f0c19795869fc2a0a.tar.gz
Qt-5d15fe23559e88a61995ad4f0c19795869fc2a0a.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile when qreal != double Make application font family names locale sensitive in X11 Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight Add line spacing to QTextBlockFormat, get/set functions, CSS support Optimize texture glyph cache Disable certain GPOS features by default Move advances for control character in Indic syllable shaping
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
index 0a7458f..b0b6b1e 100644
--- a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
@@ -103,6 +103,7 @@ private slots:
void khmer();
void linearB();
+ void controlInSyllable_qtbug14204();
};
tst_QTextScriptEngine::tst_QTextScriptEngine()
@@ -1111,6 +1112,22 @@ void tst_QTextScriptEngine::greek()
#endif
}
+void tst_QTextScriptEngine::controlInSyllable_qtbug14204()
+{
+ QString s;
+ s.append(QChar(0x0915));
+ s.append(QChar(0x094d));
+ s.append(QChar(0x200d));
+ s.append(QChar(0x0915));
+
+ QTextLayout layout(s);
+ QTextEngine *e = layout.d;
+ e->itemize();
+ e->shape(0);
+
+ QVERIFY(e->layoutData->items[0].num_glyphs == 2);
+ QVERIFY(e->layoutData->glyphLayout.advances_x[1] != 0);
+}
QTEST_MAIN(tst_QTextScriptEngine)
#include "tst_qtextscriptengine.moc"