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>

5 files changed, 4 insertions, 56 deletions

diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index 5e3aacf37e..7914ecb00c 100644
--- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
@@ -144,6 +144,8 @@ void tst_QFontDatabase::fixedPitch_data()
 #ifndef Q_WS_MAC
     QTest::newRow( "Script" ) << QString( "Script" ) << false;
     QTest::newRow( "Lucida Console" ) << QString( "Lucida Console" ) << true;
+    QTest::newRow( "DejaVu Sans" ) << QString( "DejaVu Sans" ) << false;
+    QTest::newRow( "DejaVu Sans Mono" ) << QString( "DejaVu Sans Mono" ) << true;
 #else
     QTest::newRow( "Menlo" ) << QString( "Menlo" ) << true;
     QTest::newRow( "Monaco" ) << QString( "Monaco" ) << true;
@@ -162,13 +164,6 @@ void tst_QFontDatabase::fixedPitch()
     if (!fdb.families().contains(font))
 	QSKIP( "Font not installed", SkipSingle);
 
-#ifdef Q_WS_QPA
-    if (fixedPitch) {
-        // fixedPitch() never returns true on qpa
-        QEXPECT_FAIL("", "QTBUG-20754 fails on qpa", Abort);
-    }
-#endif
-
     QCOMPARE(fdb.isFixedPitch(font), fixedPitch);
 
     QFont qfont(font);
@@ -238,10 +233,6 @@ void tst_QFontDatabase::addAppFont()
 
     QFontDatabase db;
 
-#ifdef Q_WS_QPA
-    QEXPECT_FAIL("memory font", "QTBUG-20754 fails on qpa", Abort);
-#endif
-
     const QStringList oldFamilies = db.families();
     QVERIFY(!oldFamilies.isEmpty());
 
@@ -275,10 +266,6 @@ void tst_QFontDatabase::addAppFont()
     const QStringList addedFamilies = QFontDatabase::applicationFontFamilies(id);
     QVERIFY(!addedFamilies.isEmpty());
 
-#ifdef Q_WS_QPA
-    QEXPECT_FAIL("font file", "QTBUG-20754 fails on qpa", Abort);
-#endif
-
     const QStringList newFamilies = db.families();
     QVERIFY(!newFamilies.isEmpty());
     QVERIFY(newFamilies.count() >= oldFamilies.count());
diff --git a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
index 982cfc11d9..20ff8b7d8f 100644
--- a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
+++ b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
@@ -276,21 +276,11 @@ void tst_QFontMetrics::inFontUcs4()
     QFont font("QtTestUcs4");
     {
         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));
     }
 
@@ -311,11 +301,6 @@ 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());
 }
 
diff --git a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
index e84915428f..4db01c91a2 100644
--- a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
+++ b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
@@ -97,10 +97,6 @@ void tst_QGlyphRun::initTestCase()
 
     m_testFont = QFont("QtsSpecialTestFont");
 
-#ifdef Q_WS_QPA
-    QEXPECT_FAIL("", "QTBUG-20760 fails on qpa", Abort);
-#endif
-
     QCOMPARE(QFontInfo(m_testFont).family(), QString::fromLatin1("QtsSpecialTestFont"));
 
     m_testFont_ok = true;
diff --git a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
index 1c18f2f1e8..5404b0f587 100644
--- a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
+++ b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
@@ -111,16 +111,6 @@ Q_DECLARE_METATYPE(QFontDatabase::WritingSystem)
 
 void tst_QRawFont::init()
 {
-#ifdef Q_WS_QPA
-    // Loading fonts from a QByteArray seems unimplemented for all qpa plugins at time of writing;
-    // almost all testfunctions fail on qpa due to this, except these few:
-    const QByteArray func = QTest::currentTestFunction();
-    if (func != "invalidRawFont"
-     && func != "explicitRawFontNotAvailableInSystem"
-     && func != "fromFont"
-     && func != "textLayout")
-        QEXPECT_FAIL("", "QTBUG-20976 fails on qpa", Abort);
-#endif
 }
 
 void tst_QRawFont::invalidRawFont()
@@ -308,9 +298,6 @@ void tst_QRawFont::textLayout()
     QString familyName = QString::fromLatin1("QtBidiTestFont");
     QFont font(familyName);
     font.setPixelSize(18.0);
-#ifdef Q_WS_QPA
-    QEXPECT_FAIL("", "QTBUG-20976 fails on qpa", Abort);
-#endif
     QCOMPARE(QFontInfo(font).family(), familyName);
 
     QTextLayout layout(QLatin1String("Foobar"));
@@ -628,10 +615,6 @@ void tst_QRawFont::fromFont()
     QRawFont rawFont = QRawFont::fromFont(font, writingSystem);
     QVERIFY(rawFont.isValid());
 
-#ifdef Q_WS_QPA
-    QEXPECT_FAIL("", "QTBUG-20976 fails on qpa", Abort);
-#endif
-
     QCOMPARE(rawFont.familyName(), familyName);
     QCOMPARE(rawFont.pixelSize(), 26.0);
 
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
         )