Attachment #252145 for bug #342371

View | Details | Raw Unified | Return to bug 342371
Collapse All | Expand All

Lines 1266-1271 QFont::StyleHint QFont::styleHint() const Link Here

(-)a/src/gui/text/qfont.cpp (+9 lines)
1266	\value OldEnglish the font matcher prefers decorative fonts.	1266	\value OldEnglish the font matcher prefers decorative fonts.
1267	\value Decorative is a synonym for \c OldEnglish.	1267	\value Decorative is a synonym for \c OldEnglish.
1268		1268
		1269	\value Monospace the font matcher prefers fonts that map to the
		1270	CSS generic font-family 'monospace'.
		1271
		1272	\value Fantasy the font matcher prefers fonts that map to the
		1273	CSS generic font-family 'fantasy'.
		1274
		1275	\value Cursive the font matcher prefers fonts that map to the
		1276	CSS generic font-family 'cursive'.
		1277
1269	\value System the font matcher prefers system fonts.	1278	\value System the font matcher prefers system fonts.
1270	*/	1279	*/
1271		1280

Lines 72-78 public: Link Here

(-)a/src/gui/text/qfont.h (-1 / +4 lines)
72	Courier, TypeWriter = Courier,	72	Courier, TypeWriter = Courier,
73	OldEnglish, Decorative = OldEnglish,	73	OldEnglish, Decorative = OldEnglish,
74	System,	74	System,
75	AnyStyle	75	AnyStyle,
		76	Cursive,
		77	Monospace,
		78	Fantasy
76	};	79	};
77		80
78	enum StyleStrategy {	81	enum StyleStrategy {

Lines 136-143 QString QFont::defaultFamily() const Link Here

(-)a/src/gui/text/qfont_mac.cpp (+6 lines)
136	return QString::fromLatin1("Times New Roman");	136	return QString::fromLatin1("Times New Roman");
137	case QFont::Courier:	137	case QFont::Courier:
138	return QString::fromLatin1("Courier New");	138	return QString::fromLatin1("Courier New");
		139	case QFont::Monospace:
		140	return QString::fromLatin1("Courier");
139	case QFont::Decorative:	141	case QFont::Decorative:
140	return QString::fromLatin1("Bookman Old Style");	142	return QString::fromLatin1("Bookman Old Style");
		143	case QFont::Cursive:
		144	return QString::fromLatin1("Apple Chancery");
		145	case QFont::Fantasy:
		146	return QString::fromLatin1("Papyrus");
141	case QFont::Helvetica:	147	case QFont::Helvetica:
142	case QFont::System:	148	case QFont::System:
143	default:	149	default:

Lines 108-113 QString QFont::defaultFamily() const Link Here

(-)a/src/gui/text/qfont_qws.cpp (+1 lines)
108	case QFont::Times:	108	case QFont::Times:
109	return QString::fromLatin1("times");	109	return QString::fromLatin1("times");
110	case QFont::Courier:	110	case QFont::Courier:
		111	case QFont::Monospace:
111	return QString::fromLatin1("courier");	112	return QString::fromLatin1("courier");
112	case QFont::Decorative:	113	case QFont::Decorative:
113	return QString::fromLatin1("old english");	114	return QString::fromLatin1("old english");

Lines 148-156 QString QFont::defaultFamily() const Link Here

(-)a/src/gui/text/qfont_win.cpp (+5 lines)
148	case QFont::Times:	148	case QFont::Times:
149	return QString::fromLatin1("Times New Roman");	149	return QString::fromLatin1("Times New Roman");
150	case QFont::Courier:	150	case QFont::Courier:
		151	case QFont::Monospace:
151	return QString::fromLatin1("Courier New");	152	return QString::fromLatin1("Courier New");
152	case QFont::Decorative:	153	case QFont::Decorative:
153	return QString::fromLatin1("Bookman Old Style");	154	return QString::fromLatin1("Bookman Old Style");
		155	case QFont::Cursive:
		156	return QString::fromLatin1("Comic Sans MS");
		157	case QFont::Fantasy:
		158	return QString::fromLatin1("Impact");
154	case QFont::Helvetica:	159	case QFont::Helvetica:
155	return QString::fromLatin1("Arial");	160	return QString::fromLatin1("Arial");
156	case QFont::System:	161	case QFont::System:




    case QFont::Courier:
        return QString::fromLatin1("Courier");

    case QFont::Monospace:
        return QString::fromLatin1("Courier New");

    case QFont::Cursive:
        return QString::fromLatin1("Comic Sans MS");

    case QFont::Fantasy:
        return QString::fromLatin1("Impact");

    case QFont::Decorative:
        return QString::fromLatin1("Old English");

- 

Return to bug 342371

Lines 281-286 QString QFont::defaultFamily() const Link Here

(-)a/src/gui/text/qfont_x11.cpp (-1 / +9 lines)
281	case QFont::Courier:	281	case QFont::Courier:
282	return QString::fromLatin1("Courier");	282	return QString::fromLatin1("Courier");
283		283
		284	case QFont::Monospace:
		285	return QString::fromLatin1("Courier New");
		286
		287	case QFont::Cursive:
		288	return QString::fromLatin1("Comic Sans MS");
		289
		290	case QFont::Fantasy:
		291	return QString::fromLatin1("Impact");
		292
284	case QFont::Decorative:	293	case QFont::Decorative:
285	return QString::fromLatin1("Old English");	294	return QString::fromLatin1("Old English");
286		295
287	-