summaryrefslogtreecommitdiff
path: root/Source/WebKit/win/WebKitGraphics.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2013-09-13 12:51:20 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-19 20:50:05 +0200
commitd441d6f39bb846989d95bcf5caf387b42414718d (patch)
treee367e64a75991c554930278175d403c072de6bb8 /Source/WebKit/win/WebKitGraphics.cpp
parent0060b2994c07842f4c59de64b5e3e430525c4b90 (diff)
downloadqtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit/win/WebKitGraphics.cpp')
-rw-r--r--Source/WebKit/win/WebKitGraphics.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/WebKit/win/WebKitGraphics.cpp b/Source/WebKit/win/WebKitGraphics.cpp
index 85eae16da..2a736629b 100644
--- a/Source/WebKit/win/WebKitGraphics.cpp
+++ b/Source/WebKit/win/WebKitGraphics.cpp
@@ -54,9 +54,7 @@ static Font makeFont(const WebFontDescription& description)
String fontFamilyString(description.family, description.familyLength);
FontDescription f;
- FontFamily family;
- family.setFamily(fontFamilyString);
- f.setFamily(family);
+ f.setOneFamily(fontFamilyString);
f.setSpecifiedSize(description.size);
f.setComputedSize(description.size);
f.setItalic(description.italic);