Remove static linkage of QtWebKit against the ICO image format plugin.

Instead build the support for the ICO image format as a proper standalone qt image format plugin and install it.

Signed-off-by: Adam Treat <treat@kde.org>
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27925 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f50d4ffd650dc0c028d276aa613fc0b4c044251c..8e0b453c0b1378f806a702290141064fc1032b27 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-20  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Adam Treat <treat@kde.org>.
+
+        Remove static linkage of QtWebKit against the ICO image format plugin.
+        Instead build the support for the ICO image format as a proper standalone qt image format plugin and install it.
+
+        * WebCore.pro:
+        * platform/graphics/qt/ImageDecoderQt.cpp:
+
 2007-11-20  David D. Kilzer  <ddkilzer@webkit.org>
 
         no-svg build broken after r27278

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 27a5012bdd8b2449aa0ab2bb35fa15f9194449f8..c061a93a83dcf612ae61d32e864f8d405e844577 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -69,10 +69,6 @@ include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
 #LIBS += -L$$OUTPUT_DIR/lib -lJavaScriptCore
 
 qt-port {
-!win32-* {
-    LIBS += -L$$OUTPUT_DIR/WebKit/qt/Plugins
-    LIBS += -lqtwebico
-}
 
 INCLUDEPATH += \
                 $$PWD/platform/qt \

diff --git a/WebCore/platform/graphics/qt/ImageDecoderQt.cpp b/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
index eaef4cda7d66091acc4bbb3292d210f2fa21289d..fa9c6657e87139049ffcdc9304b19dcda67e99eb 100644 (file)
--- a/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
@@ -35,10 +35,6 @@
 #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;
     const  bool debugImageDecoderQt = false;

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 6a999fdd5a8c5d895492682a4397facfe13dc318..8b2f3380b763e5055cc59f2cc34bc132bf08e670 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-20  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Adam Treat <treat@kde.org>.
+
+        Remove static linkage of QtWebKit against the ICO image format plugin.
+        
+        Instead build the support for the ICO image format as a proper standalone qt image format plugin and install it.
+        
+
+        * Plugins/Plugins.pro:
+
 2007-11-20  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by George Staikos <staikos@kde.org>.

diff --git a/WebKit/qt/Plugins/Plugins.pro b/WebKit/qt/Plugins/Plugins.pro
index 949e3218681c4a18c91f1dd9900f4b46f3b915c3..a9b4f82f62e24b3f12bf106195deb509f857e31d 100644 (file)
--- a/WebKit/qt/Plugins/Plugins.pro
+++ b/WebKit/qt/Plugins/Plugins.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = qtwebico
-CONFIG += static plugin
+CONFIG += plugin
 HEADERS += ICOHandler.h
 SOURCES += ICOHandler.cpp
 
@@ -8,3 +8,7 @@ include(../../WebKit.pri)
 
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols 
 unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
+
+target.path = $$[QT_INSTALL_PLUGINS]/imageformats
+INSTALLS += target
+