Temporarily disable the ICO support for the Qt build on Windows.

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

diff --git a/ChangeLog b/ChangeLog
index d0db7c0..9691d09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-27  Simon Hausmann  <hausmann@kde.org>
+
+        Done with and reviewed by Lars and Zack.
+
+        Temporarily disable the ICO support for the Qt build on Windows.
+
+        * WebKit.pro:
+
 2007-07-26  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Lars.

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 130bdd3..dde874f 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Done with and reviewed by Lars and Zack.
 
+        Temporarily disable the ICO support for the Qt build on Windows.
+
+        * WebCore.pro:
+        * platform/graphics/qt/ImageDecoderQt.cpp:
+
+2007-07-27  Simon Hausmann  <hausmann@kde.org>
+
+        Done with and reviewed by Lars and Zack.
+
         Fix evaluation with ActiveState Perl 5.6. Somehow it tried to treat nameEntries as array.
 
         * bindings/scripts/CodeGeneratorJS.pm:

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 1370cec..ad57731 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -63,8 +63,10 @@ macx {
 }
 
 qt-port {
-LIBS += -L$$OUTPUT_DIR/WebKitQt/Plugins
-LIBS += -lqtwebico
+!win32-* {
+    LIBS += -L$$OUTPUT_DIR/WebKitQt/Plugins
+    LIBS += -lqtwebico
+}
 
 INCLUDEPATH += \
                 $$PWD/platform/qt \

diff --git a/WebCore/platform/graphics/qt/ImageDecoderQt.cpp b/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
index 6ca20fb..cde8565 100644 (file)
--- a/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
@@ -35,7 +35,9 @@
 #include <QtGui/QImageReader>
 #include <qdebug.h>
 
+#if !defined(Q_OS_WIN)
 Q_IMPORT_PLUGIN(qtwebico) //For ico format...
+#endif
 
 namespace {
     const  QImage::Format DesiredFormat = QImage::Format_ARGB32;

diff --git a/WebKit.pro b/WebKit.pro
index 712eead..7e5f366 100644 (file)
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 !gdk-port:CONFIG += qt-port
-qt-port:SUBDIRS += WebKitQt/Plugins
+qt-port:!win32-*:SUBDIRS += WebKitQt/Plugins
 SUBDIRS += \
         JavaScriptCore/pcre/dftables.pro \
         WebCore \