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>
This commit is contained in:
parent
df516aa9f4
commit
da5d9e664f
@ -98,9 +98,7 @@ private slots:
|
|||||||
void rawFontSetPixelSize_data();
|
void rawFontSetPixelSize_data();
|
||||||
void rawFontSetPixelSize();
|
void rawFontSetPixelSize();
|
||||||
|
|
||||||
#if defined(Q_WS_X11) || defined(Q_OS_MAC)
|
|
||||||
void multipleRawFontsFromData();
|
void multipleRawFontsFromData();
|
||||||
#endif
|
|
||||||
private:
|
private:
|
||||||
QString testFont;
|
QString testFont;
|
||||||
QString testFontBoldItalic;
|
QString testFontBoldItalic;
|
||||||
@ -867,7 +865,6 @@ void tst_QRawFont::rawFontSetPixelSize()
|
|||||||
QCOMPARE(rawFont.pixelSize(), 24.0);
|
QCOMPARE(rawFont.pixelSize(), 24.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(Q_WS_X11) || defined(Q_OS_MAC)
|
|
||||||
void tst_QRawFont::multipleRawFontsFromData()
|
void tst_QRawFont::multipleRawFontsFromData()
|
||||||
{
|
{
|
||||||
QFile file(testFont);
|
QFile file(testFont);
|
||||||
@ -884,7 +881,6 @@ void tst_QRawFont::multipleRawFontsFromData()
|
|||||||
QVERIFY(testFont.familyName() != (testFontBoldItalic.familyName())
|
QVERIFY(testFont.familyName() != (testFontBoldItalic.familyName())
|
||||||
|| testFont.styleName() != (testFontBoldItalic.styleName()));
|
|| testFont.styleName() != (testFontBoldItalic.styleName()));
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // QT_NO_RAWFONT
|
#endif // QT_NO_RAWFONT
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user