[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 5b049fee33067848f2e8f5516eac5fcfd0b18632
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 8 16:06:16 2010 +0000

    Fix Qt build on Windows.
    
    Reviewed by Simon Hausmann.
    
    nmake fails to pick the right cpp file, so we have to
    rename the file to to a unique name.
    
    * WebCore.pro:
    * platform/graphics/qt/FontCustomPlatformDataQt.cpp: Renamed from WebCore/platform/graphics/qt/FontCustomPlatformData.cpp.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54490 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2781596..13884b1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-08  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Fix Qt build on Windows.
+
+        nmake fails to pick the right cpp file, so we have to
+        rename the file to to a unique name.
+
+        * WebCore.pro:
+        * platform/graphics/qt/FontCustomPlatformDataQt.cpp: Renamed from WebCore/platform/graphics/qt/FontCustomPlatformData.cpp.
+
 2010-02-08  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 4d2c597..0b062d0 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1999,7 +1999,7 @@ SOURCES += \
     platform/qt/FileSystemQt.cpp \
     platform/qt/SharedBufferQt.cpp \
     platform/graphics/qt/FontCacheQt.cpp \
-    platform/graphics/qt/FontCustomPlatformData.cpp \
+    platform/graphics/qt/FontCustomPlatformDataQt.cpp \
     platform/graphics/qt/GlyphPageTreeNodeQt.cpp \
     platform/graphics/qt/SimpleFontDataQt.cpp \
     platform/qt/KURLQt.cpp \
diff --git a/WebCore/platform/graphics/qt/FontCustomPlatformData.cpp b/WebCore/platform/graphics/qt/FontCustomPlatformDataQt.cpp
similarity index 100%
rename from WebCore/platform/graphics/qt/FontCustomPlatformData.cpp
rename to WebCore/platform/graphics/qt/FontCustomPlatformDataQt.cpp

-- 
WebKit Debian packaging