[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 5c6b609637f23517790c165a78625c8423df5a2e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 8 15:57:46 2010 +0000

    2010-03-08  Simon Hausmann  <simon.hausmann at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt] Binary incompatibility between Qt 4.6's WebKit and trunk in QWebSettings
            https://bugs.webkit.org/show_bug.cgi?id=35858
    
            Moved the enum value added in r54873 to the end of the enum, to preserve
            binary compatibility. DnsPrefetchEnabled was in the last release and needs
            to remain after LocalContentCanAccessRemoteUrls.
    
            * Api/qwebsettings.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55665 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebsettings.h b/WebKit/qt/Api/qwebsettings.h
index aed34b1..94013c8 100644
--- a/WebKit/qt/Api/qwebsettings.h
+++ b/WebKit/qt/Api/qwebsettings.h
@@ -67,12 +67,12 @@ public:
         LocalStorageDatabaseEnabled = LocalStorageEnabled,
 #endif
         LocalContentCanAccessRemoteUrls,
-        LocalContentCanAccessFileUrls,
         DnsPrefetchEnabled,
         XSSAuditorEnabled,
         AcceleratedCompositingEnabled,
         WebGLEnabled,
-        SpatialNavigationEnabled
+        SpatialNavigationEnabled,
+        LocalContentCanAccessFileUrls
     };
     enum WebGraphic {
         MissingImageGraphic,
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 4c00278..dceeffe 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-08  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Binary incompatibility between Qt 4.6's WebKit and trunk in QWebSettings
+        https://bugs.webkit.org/show_bug.cgi?id=35858
+
+        Moved the enum value added in r54873 to the end of the enum, to preserve
+        binary compatibility. DnsPrefetchEnabled was in the last release and needs
+        to remain after LocalContentCanAccessRemoteUrls.
+
+        * Api/qwebsettings.h:
+
 2010-03-06  Mark Rowe  <mrowe at apple.com>
 
         Rubber-stamped by Sam Weinig.

-- 
WebKit Debian packaging