diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-03-25 14:05:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-25 19:21:40 +0100 |
| commit | 83c9d22d4442e6c5ca3bb9243a721a286ddd1ea2 (patch) | |
| tree | 0841393c2af83e226119c7846e1f248c675e9dba /tests | |
| parent | 23051ff7ec4e367baef0fd1ee79e976943b443c9 (diff) | |
Remove dependency on QPlatformSupport in fontdatabase test
If you include a static library in the test, all symbols will
be duplicated, and this can cause nasty crashes because global
static data is also duplicated. This happened on Linux because
of a global static cache in the font engine where the two instances
of it would get out of sync, and we would reference invalid
data.
To test QPlatformSupport features, a QPlatformSupport test which
does not load any platform plugin (or uses its own platform plugin
which does not load QPlatformSupport) is needed. For now, I will
just revert adding the test, since it is broken and was added
as part of supporting Windows CE:
f2fabf77f9bc18448aed0e99a6d7d1d6c5c9c736.
Change-Id: I6c002d1e0880ee8e031a68eee80e781fe0c62af4
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/text/qfontdatabase/qfontdatabase.pro | 2 | ||||
| -rw-r--r-- | tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp | 15 |
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" |