[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 063ce8af7a7faf6d41b85498c681aa18f717e7e2
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 18 14:03:51 2009 +0000

    [Qt] Fix the build on Symbian.
    
    Reviewed by Tor Arne Vestbø.
    
    Use QFont::lastRestortFamily() instead of QFont::lastRestortFont(),
    which is a missing symbol in Qt 4.6.0 on Symbian.
    
    Functionally they should be equivalent, according to the source.
    
    * platform/graphics/qt/FontCacheQt.cpp:
    (WebCore::FontCache::getLastResortFallbackFont):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52310 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index abf2c23..4623c95 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-18  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Fix the build on Symbian.
+
+        Use QFont::lastRestortFamily() instead of QFont::lastRestortFont(),
+        which is a missing symbol in Qt 4.6.0 on Symbian.
+
+        Functionally they should be equivalent, according to the source.
+
+        * platform/graphics/qt/FontCacheQt.cpp:
+        (WebCore::FontCache::getLastResortFallbackFont):
+
 2009-12-18  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/platform/graphics/qt/FontCacheQt.cpp b/WebCore/platform/graphics/qt/FontCacheQt.cpp
index 82fb709..83df0f3 100644
--- a/WebCore/platform/graphics/qt/FontCacheQt.cpp
+++ b/WebCore/platform/graphics/qt/FontCacheQt.cpp
@@ -56,7 +56,7 @@ FontPlatformData* FontCache::getSimilarFontPlatformData(const Font& font)
 
 FontPlatformData* FontCache::getLastResortFallbackFont(const FontDescription& fontDescription)
 {
-    const AtomicString fallbackFamily = QFont(fontDescription.family().family()).lastResortFont();
+    const AtomicString fallbackFamily = QFont(fontDescription.family().family()).lastResortFamily();
     return new FontPlatformData(fontDescription, fallbackFamily);
 }
 

-- 
WebKit Debian packaging