From 0e2642b22fb92d4277a30eb75d7dc25c5fd0b703 Mon Sep 17 00:00:00 2001 From: "hausmann@webkit.org" Date: Tue, 20 Nov 2007 15:27:36 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27925 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/ChangeLog | 10 ++++++++++ WebCore/WebCore.pro | 4 ---- WebCore/platform/graphics/qt/ImageDecoderQt.cpp | 4 ---- WebKit/qt/ChangeLog | 11 +++++++++++ WebKit/qt/Plugins/Plugins.pro | 6 +++++- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index f50d4ffd650d..8e0b453c0b13 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,13 @@ +2007-11-20 Simon Hausmann + + Reviewed by Adam Treat . + + 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 no-svg build broken after r27278 diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro index 27a5012bdd8b..c061a93a83dc 100644 --- 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 eaef4cda7d66..fa9c6657e871 100644 --- a/WebCore/platform/graphics/qt/ImageDecoderQt.cpp +++ b/WebCore/platform/graphics/qt/ImageDecoderQt.cpp @@ -35,10 +35,6 @@ #include #include -#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 6a999fdd5a8c..8b2f3380b763 100644 --- a/WebKit/qt/ChangeLog +++ b/WebKit/qt/ChangeLog @@ -1,3 +1,14 @@ +2007-11-20 Simon Hausmann + + Reviewed by Adam Treat . + + 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 Reviewed by George Staikos . diff --git a/WebKit/qt/Plugins/Plugins.pro b/WebKit/qt/Plugins/Plugins.pro index 949e3218681c..a9b4f82f62e2 100644 --- 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 + -- 2.36.0