From: hausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue, 22 Jan 2008 10:03:26 +0000 (+0000)
Subject: Simon Hausmann <hausmann@webkit.org>
X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=745cd3a8dc5cdf4ac76b8c45c7228f5a4c281ef4

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 254a202..21c4fda 100644
--- 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 027017b..bc14feb 100644
--- 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