diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 09:05:42 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 09:06:31 +0200 |
| commit | 5c23199d4e8ff21661dfa5aacc13149178e78cab (patch) | |
| tree | 322aee61581d7c85f1ccb65e47d1e79eba1ba6c9 /tests/auto/gui/text | |
| parent | 252bad7c589e03d3e12df02354b00a84d8e3159a (diff) | |
| parent | c8d9b17367cfdcb034d11f8a168ca4ae3993e7c3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
configure
mkspecs/macx-xcode/Info.plist.app
mkspecs/macx-xcode/Info.plist.lib
qmake/doc/qmake.qdocconf
src/corelib/global/qglobal.h
tests/auto/other/exceptionsafety/exceptionsafety.pro
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
Diffstat (limited to 'tests/auto/gui/text')
| -rw-r--r-- | tests/auto/gui/text/qfont/tst_qfont.cpp | 9 | ||||
| -rw-r--r-- | tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/gui/text/qrawfont/tst_qrawfont.cpp | 4 |
3 files changed, 17 insertions, 0 deletions
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index b8cce2671f..acb55c2d86 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -685,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)); } diff --git a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp index 6b06424ad7..3f6eaae89b 100644 --- a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp +++ b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp @@ -502,6 +502,10 @@ void tst_QGlyphRun::drawMultiScriptText2() drawGlyphs.save("drawMultiScriptText2_drawGlyphIndexes.png"); #endif +#ifdef Q_OS_MACX + if (drawGlyphs.toImage() != textLayoutDraw.toImage()) + QEXPECT_FAIL("", "See QTBUG-32690", Continue); +#endif // Q_OS_MACX QCOMPARE(drawGlyphs, textLayoutDraw); } diff --git a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp index ae6e450301..19f60baa29 100644 --- a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp +++ b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp @@ -675,6 +675,10 @@ void tst_QRawFont::fromFont() QFontDatabase fontDatabase; int id = fontDatabase.addApplicationFont(fileName); +#ifdef Q_OS_MACX + if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) + QEXPECT_FAIL("", "See QTBUG-32654", Abort); +#endif QVERIFY(id >= 0); QFont font(familyName); |