summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@nokia.com>2012-02-01 17:13:24 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-03 01:40:22 +0100
commitda5d9e664f27abe41748f4360624c235c20e8c15 (patch)
tree9e0194a3a563c66c73405b99314da370d582c2ce
parentdf516aa9f45ac44abe0c9476ff002135b94eb542 (diff)
Un-guard a QRawFont autotest.
Let's just run this test on all platforms. Change-Id: Iffec0ddfa8a73fd9e1af1c5ea3b49c337fa8a026 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
-rw-r--r--tests/auto/gui/text/qrawfont/tst_qrawfont.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
index 63ec4b0071..99e53f3261 100644
--- a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
+++ b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
@@ -98,9 +98,7 @@ private slots:
void rawFontSetPixelSize_data();
void rawFontSetPixelSize();
-#if defined(Q_WS_X11) || defined(Q_OS_MAC)
void multipleRawFontsFromData();
-#endif
private:
QString testFont;
QString testFontBoldItalic;
@@ -867,7 +865,6 @@ void tst_QRawFont::rawFontSetPixelSize()
QCOMPARE(rawFont.pixelSize(), 24.0);
}
-#if defined(Q_WS_X11) || defined(Q_OS_MAC)
void tst_QRawFont::multipleRawFontsFromData()
{
QFile file(testFont);
@@ -884,7 +881,6 @@ void tst_QRawFont::multipleRawFontsFromData()
QVERIFY(testFont.familyName() != (testFontBoldItalic.familyName())
|| testFont.styleName() != (testFontBoldItalic.styleName()));
}
-#endif
#endif // QT_NO_RAWFONT