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

[mrowe at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 833acc226d3ee26a4aad084125993400f1808359
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 8 02:05:29 2010 +0000

    Qt build fix.
    
    * platform/network/qt/DnsPrefetchHelper.cpp: Include PlatformString.h since we're using WebCore::String.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55641 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 93a990a..9f9d3af 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-07  Mark Rowe  <mrowe at apple.com>
+
+        Qt build fix.
+
+        * platform/network/qt/DnsPrefetchHelper.cpp: Include PlatformString.h since we're using WebCore::String.
+
 2010-03-07  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/network/qt/DnsPrefetchHelper.cpp b/WebCore/platform/network/qt/DnsPrefetchHelper.cpp
index e687976..d017b90 100644
--- a/WebCore/platform/network/qt/DnsPrefetchHelper.cpp
+++ b/WebCore/platform/network/qt/DnsPrefetchHelper.cpp
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "DnsPrefetchHelper.h"
 
-#include "CString.h"
+#include "PlatformString.h"
 
 namespace WebCore {
 // this is called on mouse over a href and on page loading

-- 
WebKit Debian packaging