[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit a583d7253094ea9d3ac1c4a964c2a864906debc8
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 25 13:18:38 2010 +0000

    [Qt] Fix the build on Maemo5.
    
    Reviewed by Laszlo Gombos.
    
    https://bugs.webkit.org/show_bug.cgi?id=34051
    
    * WebKit.pri: Disable the use of uitools, just like it's done for Symbian.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53800 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index fdefebe..922e54b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-25  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Fix the build on Maemo5.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34051
+
+        * WebKit.pri: Disable the use of uitools, just like it's done for Symbian.
+
 2010-01-21  No'am Rosenthal  <noam.rosenthal at nokia.com>
 
         Reviewed by Antti Koivisto.
diff --git a/WebKit.pri b/WebKit.pri
index 7b68edb..fc3a951 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -65,7 +65,6 @@ CONFIG -= warn_on
 symbian|*-armcc {
     RVCT_COMMON_CFLAGS = --gnu --diag_suppress 68,111,177,368,830,1293
     RVCT_COMMON_CXXFLAGS = $$RVCT_COMMON_CFLAGS --no_parse_templates
-    DEFINES *= QT_NO_UITOOLS
 }
 
 *-armcc {
@@ -77,6 +76,8 @@ symbian {
     QMAKE_CXXFLAGS.ARMCC += $$RVCT_COMMON_CXXFLAGS
 }
 
+symbian|maemo5: DEFINES *= QT_NO_UITOOLS
+
 contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools
 
 # Disable a few warnings on Windows. The warnings are also

-- 
WebKit Debian packaging