From 2cc5442b0263a449f4f5eb0cbf99e419ee0d0d38 Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Tue, 20 Mar 2012 11:57:35 +0100 Subject: Remove hardcoded font names in QFont::defaultFamily() QFont::defaultFamily() should not use any hardcoded font names like "Helvetica" or "Times" as they might not be present in certain systems, it should rather use abstract names like "sans-serif", "serif" and "monospace" then let the platform plugin to decide which font map to them. Change-Id: I5aafb103a5238c17b10773711ad504806c6fc3ce Reviewed-by: Eskil Abrahamsen Blomfeldt --- tests/auto/gui/text/qfont/tst_qfont.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index ead4c8e71a..1cedfa5c01 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -630,13 +630,12 @@ void tst_QFont::defaultFamily_data() QTest::addColumn("styleHint"); QTest::addColumn("defaultFamily"); - QTest::newRow("serif") << QFont::Times << "Times"; - QTest::newRow("courier") << QFont::Courier << "Courier"; - QTest::newRow("monospace") << QFont::Monospace << "Courier New"; - QTest::newRow("cursive") << QFont::Cursive << "Comic Sans MS"; - QTest::newRow("fantasy") << QFont::Fantasy << "Impact"; - QTest::newRow("old english") << QFont::OldEnglish<< "Old English"; - QTest::newRow("sans-serif") << QFont::Helvetica << "Helvetica"; + QTest::newRow("serif") << QFont::Times << "serif"; + QTest::newRow("monospace") << QFont::Monospace << "monospace"; + QTest::newRow("sans-serif") << QFont::SansSerif << "sans-serif"; + QTest::newRow("cursive") << QFont::Cursive << "cursive"; + QTest::newRow("fantasy") << QFont::Fantasy << "fantasy"; + QTest::newRow("old english") << QFont::OldEnglish << "Old English"; } void tst_QFont::defaultFamily() -- cgit v1.2.3