diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 10:11:49 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 12:48:52 +0200 |
| commit | 04d0a9626ce61b2e05a40f9562c2bcf12e234639 (patch) | |
| tree | f1643f829aedc9ac51fcc260f7df2639dfe08360 /tests/auto/qfontmetrics/tst_qfontmetrics.cpp | |
| parent | 17f3451daa286b88a52f18c802d7b158dfb653b2 (diff) | |
| parent | bdc417b3828737334723eae23097c85f70c23a33 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/gui/kernel/qapplication_qpa.cpp
src/gui/kernel/qcursor_qpa.cpp
src/gui/kernel/qwindowsysteminterface_qpa.cpp
src/gui/kernel/qwindowsysteminterface_qpa.h
src/gui/kernel/qwindowsysteminterface_qpa_p.h
src/gui/text/qtextcontrol.cpp
src/plugins/platforms/wayland/wayland.pro
src/widgets/accessible/qaccessible2.h
src/widgets/widgets/qwidgetlinecontrol_p.h
Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74
Diffstat (limited to 'tests/auto/qfontmetrics/tst_qfontmetrics.cpp')
| -rw-r--r-- | tests/auto/qfontmetrics/tst_qfontmetrics.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp index 1df194d020..982cfc11d9 100644 --- a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp +++ b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp @@ -277,12 +277,20 @@ void tst_QFontMetrics::inFontUcs4() { QFontMetrics fm(font); +#ifdef Q_WS_QPA + QEXPECT_FAIL("", "QTBUG-20759 fails for qpa", Continue); +#endif + QVERIFY(fm.inFontUcs4(0x1D7FF)); } { QFontMetricsF fm(font); +#ifdef Q_WS_QPA + QEXPECT_FAIL("", "QTBUG-20759 fails for qpa", Continue); +#endif + QVERIFY(fm.inFontUcs4(0x1D7FF)); } @@ -303,6 +311,11 @@ void tst_QFontMetrics::lineWidth() const QFontMetrics bigFontMetrics(bigFont); QVERIFY(smallFontMetrics.lineWidth() >= 1); + +#ifdef Q_WS_QPA + QEXPECT_FAIL("", "QTBUG-20759 fails for qpa", Continue); +#endif + QVERIFY(smallFontMetrics.lineWidth() < bigFontMetrics.lineWidth()); } |