Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

1 files changed, 13 insertions, 5 deletions

diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp
index f0dd3ea4a..7709be6b4 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp
@@ -1,5 +1,6 @@
 /*
     Copyright (C) 2008 Holger Hans Peter Freyther
+    Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -21,6 +22,8 @@
 #include "config.h"
 #include "FontPlatformData.h"
 
+#include "PlatformString.h"
+
 namespace WebCore {
 
 FontPlatformData::FontPlatformData(const FontDescription& description, int wordSpacing, int letterSpacing)
@@ -40,11 +43,9 @@ FontPlatformData::FontPlatformData(const FontDescription& description, int wordS
     m_font.setFamily(familyName);
     m_font.setPixelSize(qRound(description.computedSize()));
     m_font.setItalic(description.italic());
-    // FIXME: Map all FontWeight values to QFont weights.
-    if (description.weight() >= FontWeight600)
-        m_font.setWeight(QFont::Bold);
-    else
-        m_font.setWeight(QFont::Normal);
+
+    m_font.setWeight(toQFontWeight(description.weight()));
+    m_bold = m_font.bold();
 
     bool smallCaps = description.smallCaps();
     m_font.setCapitalization(smallCaps ? QFont::SmallCaps : QFont::MixedCase);
@@ -77,4 +78,11 @@ FontPlatformData::FontPlatformData()
 {
 }
 
+#ifndef NDEBUG
+String FontPlatformData::description() const
+{
+    return String();
+}
+#endif
+
 }