diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 09:41:38 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 09:41:38 (GMT) |
| commit | 2271315eb46665b0a9e61ff0525340713163c1b6 (patch) | |
| tree | d0068e34924eca85eb6af4089b3f443a89c929f6 /tests/auto/qstatictext/tst_qstatictext.cpp | |
| parent | 33e7ee9d1866f12a9b92fe4b5549c31e30974d8e (diff) | |
| parent | 53d010a989aed878c21522cbaf0d75c7cf821b42 (diff) | |
| download | Qt-2271315eb46665b0a9e61ff0525340713163c1b6.zip Qt-2271315eb46665b0a9e61ff0525340713163c1b6.tar.gz Qt-2271315eb46665b0a9e61ff0525340713163c1b6.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure
src/corelib/global/qglobal.h
Diffstat (limited to 'tests/auto/qstatictext/tst_qstatictext.cpp')
| -rw-r--r-- | tests/auto/qstatictext/tst_qstatictext.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/auto/qstatictext/tst_qstatictext.cpp b/tests/auto/qstatictext/tst_qstatictext.cpp index 49d6633..daf0fa3 100644 --- a/tests/auto/qstatictext/tst_qstatictext.cpp +++ b/tests/auto/qstatictext/tst_qstatictext.cpp @@ -94,6 +94,8 @@ private slots: void drawStruckOutText(); void drawOverlinedText(); void drawUnderlinedText(); + + void unprintableCharacter_qtbug12614(); }; void tst_QStaticText::init() @@ -359,7 +361,7 @@ bool tst_QStaticText::supportsTransformations() const QPaintEngine::Type type = engine->type(); if (type == QPaintEngine::OpenGL -#if !defined Q_WS_WIN +#if !defined(Q_WS_WIN) && !defined(Q_WS_X11) || type == QPaintEngine::Raster #endif ) @@ -772,5 +774,14 @@ void tst_QStaticText::drawUnderlinedText() QCOMPARE(imageDrawText, imageDrawStaticText); } +void tst_QStaticText::unprintableCharacter_qtbug12614() +{ + QString s(QChar(0x200B)); // U+200B, ZERO WIDTH SPACE + + QStaticText staticText(s); + + QVERIFY(staticText.size().isValid()); // Force layout. Should not crash. +} + QTEST_MAIN(tst_QStaticText) #include "tst_qstatictext.moc" |