summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-17 13:30:56 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-17 13:30:56 (GMT)
commited32a5262fcff59771628ed22425669f00784cb2 (patch)
treeccd58fc514bf032d137b355aa5878fb59a7a49de /tests
parent2829f215ffa2aff64bd5aa60f223653b7c38c2e9 (diff)
parente45c4387ae16627d61e30a58ae901d888d375aa7 (diff)
downloadQt-ed32a5262fcff59771628ed22425669f00784cb2.zip
Qt-ed32a5262fcff59771628ed22425669f00784cb2.tar.gz
Qt-ed32a5262fcff59771628ed22425669f00784cb2.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: Fix bidi PDF mark support in Core Text shaper
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qcomplextext/tst_qcomplextext.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/tests/auto/qcomplextext/tst_qcomplextext.cpp b/tests/auto/qcomplextext/tst_qcomplextext.cpp
index fa8a2d1..c66d452 100644
--- a/tests/auto/qcomplextext/tst_qcomplextext.cpp
+++ b/tests/auto/qcomplextext/tst_qcomplextext.cpp
@@ -45,6 +45,7 @@
#if !defined(Q_WS_MAC)
#include <QtTest/QtTest>
+#include <QtGui/QtGui>
#include <private/qtextengine_p.h>
#include "bidireorderstring.h"
@@ -69,6 +70,7 @@ private slots:
void bidiReorderString_data();
void bidiReorderString();
void bidiCursor_qtbug2795();
+ void bidiCursor_PDF();
};
tst_QComplexText::tst_QComplexText()
@@ -183,6 +185,20 @@ void tst_QComplexText::bidiCursor_qtbug2795()
QVERIFY(x1 == x2);
}
+void tst_QComplexText::bidiCursor_PDF()
+{
+ QString str = QString::fromUtf8("\342\200\252hello\342\200\254");
+ QTextLayout layout(str);
+
+ layout.beginLayout();
+ QTextLine line = layout.createLine();
+ layout.endLayout();
+
+ int size = str.size();
+
+ QVERIFY(line.cursorToX(size) == line.cursorToX(size - 1));
+}
+
QTEST_MAIN(tst_QComplexText)
#include "tst_qcomplextext.moc"