[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

alex at webkit.org alex at webkit.org
Mon Feb 21 00:02:05 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 7e25856e4abfc9b7e133e4f4872a24cfd5afd8b3
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 19:16:44 2011 +0000

    2011-01-27  Alejandro G. Castro  <alex at igalia.com>
    
            Unreviewed GTK build fix after r76797.
    
            * Shared/WebPreferencesStore.h: Use Qt fonts preference for the moment.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76817 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index c280bcc..3dd6ba6 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-27  Alejandro G. Castro  <alex at igalia.com>
+
+        Unreviewed GTK build fix after r76797.
+
+        * Shared/WebPreferencesStore.h: Use Qt fonts preference for the moment.
+
 2011-01-27  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/Source/WebKit2/Shared/WebPreferencesStore.h b/Source/WebKit2/Shared/WebPreferencesStore.h
index a1e9f15..d5fbe1f 100644
--- a/Source/WebKit2/Shared/WebPreferencesStore.h
+++ b/Source/WebKit2/Shared/WebPreferencesStore.h
@@ -103,7 +103,7 @@ namespace WebKit {
     macro(SerifFontFamily, serifFontFamily, String, String, "Times") \
     \
 
-#elif PLATFORM(QT)
+#elif PLATFORM(QT) || PLATFORM(GTK)
 
 #define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
     macro(StandardFontFamily, standardFontFamily, String, String, "Times") \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list