Commit c67aba25 authored by hausmann's avatar hausmann
Browse files

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


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@24705 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 39155fca
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> 2007-07-26 Simon Hausmann <hausmann@kde.org>
Reviewed by Lars. Reviewed by Lars.
......
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.
* WebCore.pro:
* platform/graphics/qt/ImageDecoderQt.cpp:
2007-07-27 Simon Hausmann <hausmann@kde.org> 2007-07-27 Simon Hausmann <hausmann@kde.org>
   
Done with and reviewed by Lars and Zack. Done with and reviewed by Lars and Zack.
...@@ -63,8 +63,10 @@ macx { ...@@ -63,8 +63,10 @@ macx {
} }
qt-port { qt-port {
LIBS += -L$$OUTPUT_DIR/WebKitQt/Plugins !win32-* {
LIBS += -lqtwebico LIBS += -L$$OUTPUT_DIR/WebKitQt/Plugins
LIBS += -lqtwebico
}
INCLUDEPATH += \ INCLUDEPATH += \
$$PWD/platform/qt \ $$PWD/platform/qt \
......
...@@ -35,7 +35,9 @@ ...@@ -35,7 +35,9 @@
#include <QtGui/QImageReader> #include <QtGui/QImageReader>
#include <qdebug.h> #include <qdebug.h>
#if !defined(Q_OS_WIN)
Q_IMPORT_PLUGIN(qtwebico) //For ico format... Q_IMPORT_PLUGIN(qtwebico) //For ico format...
#endif
namespace { namespace {
const QImage::Format DesiredFormat = QImage::Format_ARGB32; const QImage::Format DesiredFormat = QImage::Format_ARGB32;
......
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
!gdk-port:CONFIG += qt-port !gdk-port:CONFIG += qt-port
qt-port:SUBDIRS += WebKitQt/Plugins qt-port:!win32-*:SUBDIRS += WebKitQt/Plugins
SUBDIRS += \ SUBDIRS += \
JavaScriptCore/pcre/dftables.pro \ JavaScriptCore/pcre/dftables.pro \
WebCore \ WebCore \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment