Simon Hausmann <hausmann@webkit.org>

Don't compile the ICO plugin when building against Qt >= 4.4

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

diff --git a/ChangeLog b/ChangeLog
index 254a2023fa7ffb986fbf97d558a6d8d64afe43ff..21c4fda30beab1df5576fc17269f26ed45749883 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-22  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Lars.
+
+        Don't compile the ICO plugin when building against Qt >= 4.4
+        
+
+        * WebKit.pro:
+
 2008-01-21  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
 
         Reviewed by Alp Toker.

diff --git a/WebKit.pro b/WebKit.pro
index 027017bd8d7c9d3210bf71e7a133325926be9069..bc14feb5f6b430ef787104d45e688e1237a3c29d 100644 (file)
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -1,7 +1,11 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 !gtk-port:CONFIG += qt-port
-qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins
+qt-port {
+    lessThan(QT_MINOR_VERSION, 4) {
+        !win32-*:SUBDIRS += WebKit/qt/Plugins
+    }
+}
 SUBDIRS += \
         WebCore \
         JavaScriptCore/kjs/testkjs.pro