summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/gui/text/qfontdatabase/qfontdatabase.pro2
-rw-r--r--tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp15
2 files changed, 1 insertions, 16 deletions
diff --git a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
index 3111f515ec..fe94abba8b 100644
--- a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
+++ b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
@@ -4,7 +4,7 @@ TARGET = tst_qfontdatabase
SOURCES += tst_qfontdatabase.cpp
DEFINES += SRCDIR=\\\"$$PWD\\\"
QT += testlib
-!mac: QT += core-private gui-private platformsupport-private
+!mac: QT += core-private gui-private
wince* {
additionalFiles.files = FreeMono.ttf
diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index 7afc049023..a9ad299ad8 100644
--- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
@@ -44,9 +44,6 @@
#include <qfontdatabase.h>
#include <qfontinfo.h>
#include <qfontmetrics.h>
-#ifndef Q_OS_MAC
-#include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
-#endif
class tst_QFontDatabase : public QObject
{
@@ -76,10 +73,6 @@ private slots:
void addAppFont_data();
void addAppFont();
-
-#ifndef Q_OS_MAC
- void fontName();
-#endif
};
tst_QFontDatabase::tst_QFontDatabase()
@@ -275,13 +268,5 @@ void tst_QFontDatabase::addAppFont()
QCOMPARE(db.families(), oldFamilies);
}
-#ifndef Q_OS_MAC
-void tst_QFontDatabase::fontName()
-{
- QString fontName = QBasicFontDatabase::fontNameFromTTFile(QStringLiteral("FreeMono.ttf"));
- QCOMPARE(fontName, QStringLiteral("FreeMono"));
-}
-#endif
-
QTEST_MAIN(tst_QFontDatabase)
#include "tst_qfontdatabase.moc"