diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-19 13:40:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-19 13:40:12 (GMT) |
| commit | 8abec241434604ca5559cc150a383e2f000a0e48 (patch) | |
| tree | 141f882da4b1f90f21cf53462e227a7eb627f08a /tests | |
| parent | 9bf48a32f5fd6f9f900f8746b4953c0aff982dde (diff) | |
| parent | 770fb729929764a1f1c5fbd3d54714cf811c81e0 (diff) | |
| download | Qt-8abec241434604ca5559cc150a383e2f000a0e48.zip Qt-8abec241434604ca5559cc150a383e2f000a0e48.tar.gz Qt-8abec241434604ca5559cc150a383e2f000a0e48.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:
Supporting Qt application fonts on Symbian
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qfontdatabase/tst_qfontdatabase.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/qfontdatabase/tst_qfontdatabase.cpp index ead000c..8b6f621 100644 --- a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/qfontdatabase/tst_qfontdatabase.cpp @@ -191,9 +191,6 @@ void tst_QFontDatabase::addAppFont_data() void tst_QFontDatabase::addAppFont() { -#ifdef Q_OS_SYMBIAN - QSKIP( "Symbian: Application fonts are not yet supported", SkipAll ); -#else QFETCH(bool, useMemoryFont); QSignalSpy fontDbChangedSpy(QApplication::instance(), SIGNAL(fontDatabaseChanged())); @@ -243,7 +240,6 @@ void tst_QFontDatabase::addAppFont() QCOMPARE(fontDbChangedSpy.count(), 2); QVERIFY(db.families() == oldFamilies); -#endif } QTEST_MAIN(tst_QFontDatabase) |