Reviewed/landed by Adam.

        Fixes parts of: http://bugzilla.opendarwin.org/show_bug.cgi?id=10467
        WebKit should have Qt platform support

        * CMakeLists.txt:
            Remove KCanvasMatrix.cpp because it no longer exists
            Remove platform/qt/test
        * platform/FloatSize.h:
        * platform/image-decoders/bmp/BMPImageDecoder.cpp:
        * platform/image-decoders/gif/GIFImageDecoder.cpp:
        * platform/image-decoders/gif/GIFImageReader.cpp:
        * platform/image-decoders/ico/ICOImageDecoder.cpp:
        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
        * platform/image-decoders/png/PNGImageDecoder.cpp:
        * platform/image-decoders/xbm/XBMImageDecoder.cpp:
            Added PLATFORM(QT) hooks in the image-decoders/, as they also need
            to work for Qt, not only for Cairo.
        * platform/qt/qt-encodings.txt: Added (required for build).

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16016 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 0d7d8adc3aeff6701985de66080b6818072e9ac7..d678270561852ebb3bca5c270dd3d718a11201fa 100644 (file)
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -44,7 +44,7 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}/platform/image-decoders/bmp
    ${CMAKE_CURRENT_SOURCE_DIR}/platform/image-decoders/png
    ${CMAKE_CURRENT_SOURCE_DIR}/platform/qt
-   ${CMAKE_CURRENT_SOURCE_DIR}/WebCore+SVG 
+   ${CMAKE_CURRENT_SOURCE_DIR}/WebCore+SVG
    ${CMAKE_CURRENT_SOURCE_DIR}/../JavaScriptCore/kjs
    ${CMAKE_CURRENT_SOURCE_DIR}/../JavaScriptCore/
    ${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -519,7 +519,6 @@ set (SVG_STUFF
     kcanvas/KCanvasResources.cpp
     kcanvas/RenderSVGImage.cpp
     kcanvas/RenderForeignObject.cpp
-    kcanvas/KCanvasMatrix.cpp
  )
 ENDIF(USE_WEBKIT_SVG_SUPPORT)
 
@@ -1027,5 +1026,3 @@ target_link_libraries(WebCore-unity
   pcre-unity
 
 )
-
-add_subdirectory( platform/qt/test )

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index af805966917aad3167ec995d755d71156de8e765..c04be11b7c63dd393e7bfaf11b993de1239878fa 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2006-08-24  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed/landed by Adam.
+
+        Fixes parts of: http://bugzilla.opendarwin.org/show_bug.cgi?id=10467
+        WebKit should have Qt platform support
+
+        * CMakeLists.txt:
+            Remove KCanvasMatrix.cpp because it no longer exists
+            Remove platform/qt/test
+        * platform/FloatSize.h:
+        * platform/image-decoders/bmp/BMPImageDecoder.cpp:
+        * platform/image-decoders/gif/GIFImageDecoder.cpp:
+        * platform/image-decoders/gif/GIFImageReader.cpp:
+        * platform/image-decoders/ico/ICOImageDecoder.cpp:
+        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
+        * platform/image-decoders/png/PNGImageDecoder.cpp:
+        * platform/image-decoders/xbm/XBMImageDecoder.cpp:
+            Added PLATFORM(QT) hooks in the image-decoders/, as they also need
+            to work for Qt, not only for Cairo.
+        * platform/qt/qt-encodings.txt: Added (required for build).
+
 2006-08-24  Adam Roben  <aroben@apple.com>
 
         Fixing a typo from last patch.

diff --git a/WebCore/platform/FloatSize.h b/WebCore/platform/FloatSize.h
index 74ab6a6307d15989187ea90d8a2172ed26b81101..6cef85bff98e2e394dd30c0bc81e80b45b745198 100644 (file)
--- a/WebCore/platform/FloatSize.h
+++ b/WebCore/platform/FloatSize.h
@@ -27,6 +27,8 @@
 #ifndef FloatSize_h
 #define FloatSize_h
 
+#include <wtf/Platform.h>
+
 #if PLATFORM(CG)
 typedef struct CGSize CGSize;
 #endif

diff --git a/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp b/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp
index 8016e81fe56414321d94b18d323f4881bb3da533..f00c410f9f029e50ec9f7637ea9e4724bd541b95 100644 (file)
--- a/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "BMPImageDecoder.h"
 
-#if PLATFORM(CAIRO)
+#if PLATFORM(CAIRO) || PLATFORM(QT)
 
 namespace WebCore
 {

diff --git a/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp b/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
index b1049b8b7db479cba943c247c6205e19b47463a5..691b400ce591f7334e318cb1e94e149ac1ef9807 100644 (file)
--- a/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
@@ -26,7 +26,7 @@
 #include "GIFImageDecoder.h"
 #include "GIFImageReader.h"
 
-#if PLATFORM(CAIRO)
+#if PLATFORM(CAIRO) || PLATFORM(QT)
 
 namespace WebCore {
 

diff --git a/WebCore/platform/image-decoders/gif/GIFImageReader.cpp b/WebCore/platform/image-decoders/gif/GIFImageReader.cpp
index 0475b1ff943f54e57733efe0e590c473a5328ad6..ddf6863feed05bf581856c687dc8f95dabd6ddf5 100644 (file)
--- a/WebCore/platform/image-decoders/gif/GIFImageReader.cpp
+++ b/WebCore/platform/image-decoders/gif/GIFImageReader.cpp
@@ -78,7 +78,7 @@ mailing address.
 #include <string.h>
 #include "GIFImageDecoder.h"
 
-#if PLATFORM(CAIRO)
+#if PLATFORM(CAIRO) || PLATFORM(QT)
 
 using WebCore::GIFImageDecoder;
 

diff --git a/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp b/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp
index 59e3ebb7b16a9e313bd5193c2ff129333cd45c45..b795349785efcd35feda007ade9f7c2b103701b9 100644 (file)
--- a/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "ICOImageDecoder.h"
 
-#if PLATFORM(CAIRO)
+#if PLATFORM(CAIRO) || PLATFORM(QT)
 
 namespace WebCore
 {

diff --git a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
index d6474d04d3b7c2020d741a3073b98a0490722a60..2a00e5a46c70e996e9ea98c645e6c62929389d37 100644 (file)
--- a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
@@ -39,7 +39,7 @@
 #include "JPEGImageDecoder.h"
 #include <assert.h>
 
-#if PLATFORM(CAIRO)
+#if PLATFORM(CAIRO) || PLATFORM(QT)
 
 extern "C" {
 #include "jpeglib.h"

diff --git a/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp b/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
index e8a69bcd9066b4997be46598f911edec7a15c0a4..d841d8ce1057e6f503d458a3a14681e0d36f3fc5 100644 (file)
--- a/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -39,7 +39,7 @@
 #include "png.h"
 #include "assert.h"
 
-#if PLATFORM(CAIRO)
+#if PLATFORM(CAIRO) || PLATFORM(QT)
 
 namespace WebCore {
 

diff --git a/WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp b/WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp
index 207d964441f2abccfa88181f53e16a193fa23701..3ca8538f023cd0db93d71c24e14bca967079d2ab 100644 (file)
--- a/WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "XBMImageDecoder.h"
  
-#if PLATFORM(CAIRO)
+#if PLATFORM(CAIRO) || PLATFORM(QT)
 
 namespace WebCore
 {