Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 252145 Details for
Bug 342371
dev-python/PyQt4-4.8 failed on compile
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch that fixes the problem
add-style-hints.patch (text/plain), 4.46 KB, created by
Kyle Milz
on 2010-10-27 05:15:28 UTC
(
hide
)
Description:
patch that fixes the problem
Filename:
MIME Type:
Creator:
Kyle Milz
Created:
2010-10-27 05:15:28 UTC
Size:
4.46 KB
patch
obsolete
>From 6d5655089fa4e2231a1a8edc98ecbb6b29e344e1 Mon Sep 17 00:00:00 2001 >From: =?utf-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@nokia.com> >Date: Mon, 5 Jul 2010 17:38:51 +0200 >Subject: [PATCH] Add three new style-hints to QFont to match CSS' generic font families > >The defaults were chosen to match major web browsers. See: > > http://xhva.net/log/?p=160 > >Reviewed-by: Simon Hausmann >--- > src/gui/text/qfont.cpp | 9 +++++++++ > src/gui/text/qfont.h | 5 ++++- > src/gui/text/qfont_mac.cpp | 6 ++++++ > src/gui/text/qfont_qws.cpp | 1 + > src/gui/text/qfont_win.cpp | 5 +++++ > src/gui/text/qfont_x11.cpp | 9 +++++++++ > 6 files changed, 34 insertions(+), 1 deletions(-) > >diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp >index c229242..3fe98e1 100644 >--- a/src/gui/text/qfont.cpp >+++ b/src/gui/text/qfont.cpp >@@ -1266,6 +1266,15 @@ QFont::StyleHint QFont::styleHint() const > \value OldEnglish the font matcher prefers decorative fonts. > \value Decorative is a synonym for \c OldEnglish. > >+ \value Monospace the font matcher prefers fonts that map to the >+ CSS generic font-family 'monospace'. >+ >+ \value Fantasy the font matcher prefers fonts that map to the >+ CSS generic font-family 'fantasy'. >+ >+ \value Cursive the font matcher prefers fonts that map to the >+ CSS generic font-family 'cursive'. >+ > \value System the font matcher prefers system fonts. > */ > >diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h >index 6f62424..2cc41e1 100644 >--- a/src/gui/text/qfont.h >+++ b/src/gui/text/qfont.h >@@ -72,7 +72,10 @@ public: > Courier, TypeWriter = Courier, > OldEnglish, Decorative = OldEnglish, > System, >- AnyStyle >+ AnyStyle, >+ Cursive, >+ Monospace, >+ Fantasy > }; > > enum StyleStrategy { >diff --git a/src/gui/text/qfont_mac.cpp b/src/gui/text/qfont_mac.cpp >index 93985ab..0bc8ca2 100644 >--- a/src/gui/text/qfont_mac.cpp >+++ b/src/gui/text/qfont_mac.cpp >@@ -136,8 +136,14 @@ QString QFont::defaultFamily() const > return QString::fromLatin1("Times New Roman"); > case QFont::Courier: > return QString::fromLatin1("Courier New"); >+ case QFont::Monospace: >+ return QString::fromLatin1("Courier"); > case QFont::Decorative: > return QString::fromLatin1("Bookman Old Style"); >+ case QFont::Cursive: >+ return QString::fromLatin1("Apple Chancery"); >+ case QFont::Fantasy: >+ return QString::fromLatin1("Papyrus"); > case QFont::Helvetica: > case QFont::System: > default: >diff --git a/src/gui/text/qfont_qws.cpp b/src/gui/text/qfont_qws.cpp >index 51af1e1..72f8c37 100644 >--- a/src/gui/text/qfont_qws.cpp >+++ b/src/gui/text/qfont_qws.cpp >@@ -108,6 +108,7 @@ QString QFont::defaultFamily() const > case QFont::Times: > return QString::fromLatin1("times"); > case QFont::Courier: >+ case QFont::Monospace: > return QString::fromLatin1("courier"); > case QFont::Decorative: > return QString::fromLatin1("old english"); >diff --git a/src/gui/text/qfont_win.cpp b/src/gui/text/qfont_win.cpp >index a9610f7..fa45ae1 100644 >--- a/src/gui/text/qfont_win.cpp >+++ b/src/gui/text/qfont_win.cpp >@@ -148,9 +148,14 @@ QString QFont::defaultFamily() const > case QFont::Times: > return QString::fromLatin1("Times New Roman"); > case QFont::Courier: >+ case QFont::Monospace: > return QString::fromLatin1("Courier New"); > case QFont::Decorative: > return QString::fromLatin1("Bookman Old Style"); >+ case QFont::Cursive: >+ return QString::fromLatin1("Comic Sans MS"); >+ case QFont::Fantasy: >+ return QString::fromLatin1("Impact"); > case QFont::Helvetica: > return QString::fromLatin1("Arial"); > case QFont::System: >diff --git a/src/gui/text/qfont_x11.cpp b/src/gui/text/qfont_x11.cpp >index 39127dc..92e2326 100644 >--- a/src/gui/text/qfont_x11.cpp >+++ b/src/gui/text/qfont_x11.cpp >@@ -281,6 +281,15 @@ QString QFont::defaultFamily() const > 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"); > >-- >1.6.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 342371
:
251729
| 252145