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

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit d783446198ae04e3806233442fd6e09259633016
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 13:36:20 2010 +0000

    Unreviewed buildfix.
    
    [Qt] Treat warnings as errors by default for gcc
    https://bugs.webkit.org/show_bug.cgi?id=43191
    
    The buildfix r66990 fixes the build for the Maemo
    branch of Qt, but the symbols maemo5 and 6 are not defined
    for regular branches on ARM.
    This fixes the build by disabling -Werror for any ARM platform.
    
    * WebKit.pri: Don't add -Werror for arm platforms.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67081 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index ad2113a..d857620 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-09  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Unreviewed buildfix.
+
+        [Qt] Treat warnings as errors by default for gcc
+        https://bugs.webkit.org/show_bug.cgi?id=43191
+
+        The buildfix r66990 fixes the build for the Maemo
+        branch of Qt, but the symbols maemo5 and 6 are not defined
+        for regular branches on ARM.
+        This fixes the build by disabling -Werror for any ARM platform.
+
+        * WebKit.pri: Don't add -Werror for arm platforms.
+
 2010-09-08  Peter Kasting  <pkasting at google.com>
 
         Reviewed by David Hyatt.
diff --git a/WebKit.pri b/WebKit.pri
index faa141d..42725d2 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -67,7 +67,7 @@ CONFIG -= warn_on
 *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
 
 # Treat warnings as errors on x86/Linux/GCC
-linux-g++*:!maemo5:!maemo6: QMAKE_CXXFLAGS += -Werror
+linux-g++*:!isEqual(QT_ARCH,arm): QMAKE_CXXFLAGS += -Werror
 
 # Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT
 symbian|*-armcc {

-- 
WebKit Debian packaging