AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expect fail font family mismatch in the right place

Browse Source 
This fixes 4ca4fb93f6
where the fix was right, just in the wrong place.

Change-Id: I3cde24624e3789870f1c16ccb92f78f7fc567fd5
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
This commit is contained in:
Frederik Gladhorn 2013-08-07 13:14:32 +02:00 committed by The Qt Project
parent 1142dde83e
commit c98943b4cd
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/auto/gui/text/qfont/tst_qfont.cpp
View File

@ -667,15 +667,6 @@ void tst_QFont::defaultFamily_data()
void tst_QFont::defaultFamily()
{
#if defined(Q_OS_MAC)
if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) {
QEXPECT_FAIL("serif", "See QTBUG-32834", Continue);
QEXPECT_FAIL("monospace", "See QTBUG-32834", Continue);
QEXPECT_FAIL("cursive", "See QTBUG-32834", Continue);
QEXPECT_FAIL("fantasy", "See QTBUG-32834", Continue);
}
#endif
QFETCH(QFont::StyleHint, styleHint);
QFETCH(QStringList, acceptableFamilies);
@ -694,6 +685,15 @@ void tst_QFont::defaultFamily()
break;
}
}
#if defined(Q_OS_MAC)
if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) {
QEXPECT_FAIL("serif", "See QTBUG-32834", Continue);
QEXPECT_FAIL("monospace", "See QTBUG-32834", Continue);
QEXPECT_FAIL("cursive", "See QTBUG-32834", Continue);
QEXPECT_FAIL("fantasy", "See QTBUG-32834", Continue);
}
#endif
QVERIFY2(isAcceptable, msgNotAcceptableFont(familyForHint, acceptableFamilies));
}