[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[vestbo at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 65c7f5efd7ebb8cae1316892d7724ec7816abdd2
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 26 11:12:43 2010 +0000

    [Qt] Fix feature detection regexp
    
    Reviewed by Simon Hausmann.
    
    We were missing the last feature
    
    * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64039 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 317c4f4..a7789e1 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-26  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix feature detection regexp
+
+        We were missing the last feature
+
+        * Scripts/webkitdirs.pm:
+
 2010-07-25  Darin Adler  <darin at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index d95f2a1..745e808 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -674,7 +674,7 @@ sub determineQtFeatureDefaults()
     my $defaults = `qmake CONFIG+=compute_defaults 2>&1`;
     chdir $originalCwd;
 
-    while ($defaults =~ m/(\S*?)=(.*?)( |$)/gi) {
+    while ($defaults =~ m/(\S+?)=(\S+?)/gi) {
         $qtFeatureDefaults{$1}=$2;
     }
 }

-- 
WebKit Debian packaging