[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kevino at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 8d445c4cde3b02742918062fd653d2ef9d4d4227
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 26 19:46:34 2009 +0000

    wx build fix. Make sure isQt() doesn't return true if --wx was passed to build-webkit.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50086 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 846ba49..b14bb0a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-26  Kevin Ollivier  <kevino at theolliviers.com>
+
+        wx build fix. Make sure isQt() doesn't return true if --wx was passed to build-webkit.
+
+        * Scripts/webkitdirs.pm:
+
 2009-10-26  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index cabeb21..16f9c26 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -810,7 +810,7 @@ sub determineIsQt()
     }
 
     # The presence of QTDIR only means Qt if --gtk is not on the command-line
-    if (isGtk()) {
+    if (isGtk() || isWx()) {
         $isQt = 0;
         return;
     }

-- 
WebKit Debian packaging