2011-01-11 Laszlo Gombos <laszlo.1.gombos@nokia.com>
authorlaszlo.1.gombos@nokia.com <laszlo.1.gombos@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Jan 2011 20:33:02 +0000 (20:33 +0000)
committerlaszlo.1.gombos@nokia.com <laszlo.1.gombos@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Jan 2011 20:33:02 +0000 (20:33 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@75533 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
WebKit.pri

index 3b49ca3..8ed79c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-11  Laszlo Gombos  <laszlo.1.gombos@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@chromium.org>
 
         Unreviewed. Update .gitignore with new Chromium dependency.
index b0b0f32..8f18bf5 100644 (file)
@@ -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