diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-07-16 15:46:21 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-07-16 15:46:21 (GMT) |
| commit | 6b1b666574d6e27efdd3b243de8815a5278c3666 (patch) | |
| tree | 7a5ac02fe569b3fc497ca8d0a333d10587eb3567 /src/gui/text/qfont_win.cpp | |
| parent | eef1d13743baddf41bd135d98fc2ad12944b8477 (diff) | |
| parent | ab4dde176cfa314522964e5e5fbf9f2d388f8fdf (diff) | |
| download | Qt-6b1b666574d6e27efdd3b243de8815a5278c3666.zip Qt-6b1b666574d6e27efdd3b243de8815a5278c3666.tar.gz Qt-6b1b666574d6e27efdd3b243de8815a5278c3666.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'src/gui/text/qfont_win.cpp')
| -rw-r--r-- | src/gui/text/qfont_win.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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: |