+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.
+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>
Done with and reviewed by Lars and Zack.
}
qt-port {
-LIBS += -L$$OUTPUT_DIR/WebKitQt/Plugins
-LIBS += -lqtwebico
+!win32-* {
+ LIBS += -L$$OUTPUT_DIR/WebKitQt/Plugins
+ LIBS += -lqtwebico
+}
INCLUDEPATH += \
$$PWD/platform/qt \
#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;
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 \