summaryrefslogtreecommitdiffstats
path: root/tests/auto/qfont/tst_qfont.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-28 16:03:54 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-28 16:03:54 (GMT)
commite364e7c006d27c030c8d02d49fece5e6130ee84e (patch)
tree02b6c800e4418da636ae43dacce34c56ade6dd60 /tests/auto/qfont/tst_qfont.cpp
parent8b533a7564c634e6e7228c5e02832d55513777b5 (diff)
parentc4ef479906f073fa84999eb950f00e264ebd4e8e (diff)
downloadQt-e364e7c006d27c030c8d02d49fece5e6130ee84e.zip
Qt-e364e7c006d27c030c8d02d49fece5e6130ee84e.tar.gz
Qt-e364e7c006d27c030c8d02d49fece5e6130ee84e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QFontMetrics::lineWidth() for fonts with defined point size Implemeting, exporting and autotesting QFont::lastResortFont() Fixed compile error on non-Symbian platforms. Fixed regression when typing in QTextControl based widgets on Symbian Fixed incorrect snippet in BLD_INF_RULES documentation Streamlined smart installer package creation
Diffstat (limited to 'tests/auto/qfont/tst_qfont.cpp')
-rw-r--r--tests/auto/qfont/tst_qfont.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/qfont/tst_qfont.cpp b/tests/auto/qfont/tst_qfont.cpp
index 7bda665..296ed68 100644
--- a/tests/auto/qfont/tst_qfont.cpp
+++ b/tests/auto/qfont/tst_qfont.cpp
@@ -76,6 +76,7 @@ private slots:
void italicOblique();
void insertAndRemoveSubstitutions();
void serializeSpacing();
+ void lastResortFont();
};
// Testing get/set functions
@@ -593,5 +594,11 @@ void tst_QFont::serializeSpacing()
QCOMPARE(font3.wordSpacing(), 50.);
}
+void tst_QFont::lastResortFont()
+{
+ QFont font;
+ QVERIFY(!font.lastResortFont().isEmpty());
+}
+
QTEST_MAIN(tst_QFont)
#include "tst_qfont.moc"