[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the webkit-1.3 branch:
commit 4d9b8006755a6192c1f6d61bb1708cdd9a996a48
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 11 20:33:02 2011 +0000

    2011-01-11  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Csaba Osztrogonác.
    
            [Qt] Add QT_NO_CONCURRENT to the qt_minimal configuration
            https://bugs.webkit.org/show_bug.cgi?id=52223
    
            Add QT_NO_CONCURRENT to the qt_minimal configuration to make sure
            that QtWebKit builds with QT_NO_CONCURRENT defined.
    
            * WebKit.pri:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75533 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 3b49ca3..8ed79c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-11  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Add QT_NO_CONCURRENT to the qt_minimal configuration
+        https://bugs.webkit.org/show_bug.cgi?id=52223
+
+        Add QT_NO_CONCURRENT to the qt_minimal configuration to make sure
+        that QtWebKit builds with QT_NO_CONCURRENT defined.
+
+        * WebKit.pri:
+
 2011-01-11  Mihai Parparita  <mihaip at chromium.org>
 
         Unreviewed. Update .gitignore with new Chromium dependency.
diff --git a/WebKit.pri b/WebKit.pri
index b0b0f32..8f18bf5 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -114,6 +114,7 @@ CONFIG(qt_minimal) {
     DEFINES *= QT_NO_BEARERMANAGEMENT
     DEFINES *= QT_NO_CLIPBOARD
     DEFINES *= QT_NO_COMBOBOX
+    DEFINES *= QT_NO_CONCURRENT
     DEFINES *= QT_NO_CRASHHANDLER
     DEFINES *= QT_NO_CURSOR
     DEFINES *= QT_NO_DESKTOPSERVICES

-- 
WebKit Debian packaging