diff options
author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-09-22 14:23:29 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-23 10:48:37 +0200 |
commit | 8b4e40f5354ef81c40d8da35e0e79b2a87278e31 (patch) | |
tree | 4a6efda2e6a3de84668199752107ae72f795e778 /tests/auto/gui/text/qstatictext/tst_qstatictext.cpp | |
parent | 9ee53afb32cc1bea6f60f4ca7a951330a979c04a (diff) |
Support adding application fonts with QFontconfigDatabase
QFontDatabaseQPA should be able to reinitialize database and
reregister all the fonts when an application font is added, because
it will trigger db->invalidate().
Add cloneWithSize support to QFontEngineBox so that even no usable
font is found in QFontDatabase, QRawFont::setPixelSize can still
work (without making the result rawfont invalid).
Register application fonts with QFontconfigDatabase, the code is
adapted from QFontDatabaseX11.
Reenable QRawFont tests for QPA, these usages are now supported in
QPA.
Fix QStaticText tests, raster in QPA does support transformations.
Translate the text before ZAxix rotation so that it will be visible
in canvas.
Add back fixedPitch support to QPA, and fix QFontDatabase tests.
Fix QGlyphRun tests, ignore non-existence glyphs in alphaMap
locking.
Fix QFontMetrics tests.
Task-number: QTBUG-21415, QTBUG-20754, QTBUG-20977,
QTBUG-20976, QTBUG-20760, QTBUG-20759
Change-Id: I24aea7d6ec6b2ac6342134d1f2591327c23a692b
Reviewed-on: http://codereview.qt-project.org/5384
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'tests/auto/gui/text/qstatictext/tst_qstatictext.cpp')
-rw-r--r-- | tests/auto/gui/text/qstatictext/tst_qstatictext.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp index 79cbd692ea..4bd50008db 100644 --- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp +++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp @@ -232,6 +232,7 @@ void tst_QStaticText::prepareToCorrectData() { QTransform transform; transform.scale(2.0, 2.0); + transform.translate(100, 10); transform.rotate(90, Qt::ZAxis); QPixmap imageDrawText(1000, 1000); @@ -258,10 +259,6 @@ void tst_QStaticText::prepareToCorrectData() imageDrawStaticText.save("prepareToCorrectData_imageDrawStaticText.png"); #endif -#ifdef Q_WS_QPA - QEXPECT_FAIL("", "QTBUG-20977 fails on qpa", Abort); -#endif - QVERIFY(imageDrawText.toImage() != m_whiteSquare); if (!supportsTransformations()) @@ -396,7 +393,7 @@ bool tst_QStaticText::supportsTransformations() const QPaintEngine::Type type = engine->type(); if (type == QPaintEngine::OpenGL -#if !defined(Q_WS_WIN) && !defined(Q_WS_X11) && !defined(Q_WS_MAC) +#if !defined(Q_WS_WIN) && !defined(Q_WS_X11) && !defined(Q_WS_MAC) && !defined(Q_WS_QPA) || type == QPaintEngine::Raster #endif ) |