[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit daa95c48714ecac87f6801b4526857e6a74dd07b
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 11 04:11:47 2010 +0000

    Fix Qt build.
    
    * Api/qwebsettings.cpp:
    (QWebSettingsPrivate::apply):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67276 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index d88b0da..b71de25 100644
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -217,10 +217,6 @@ void QWebSettingsPrivate::apply()
         QString storagePath = !localStoragePath.isEmpty() ? localStoragePath : global->localStoragePath;
         settings->setLocalStorageDatabasePath(storagePath);
 
-        value = attributes.value(QWebSettings::ZoomTextOnly,
-                                 global->attributes.value(QWebSettings::ZoomTextOnly));
-        settings->setZoomMode(value ? WebCore::ZoomTextOnly : WebCore::ZoomPage);
-
         value = attributes.value(QWebSettings::PrintElementBackgrounds,
                                       global->attributes.value(QWebSettings::PrintElementBackgrounds));
         settings->setShouldPrintBackgrounds(value);
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 7c1ecd7..1d5040b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,12 @@
 2010-09-10  Sam Weinig  <sam at webkit.org>
 
+        Fix Qt build.
+
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+
+2010-09-10  Sam Weinig  <sam at webkit.org>
+
         Reviewed by Darin Adler.
 
         Remove unnecessary constraint in WebCore of choosing either text zoom or full page zoom.

-- 
WebKit Debian packaging