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

[hausmann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0f5bc39e1e3c5c981be8af3f3d58c0cdf4045668
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 10:35:08 2010 +0000

    [Qt] Fix the build on non-x86 platforms with gcc
    
    Reviewed by Csaba Osztrogonác.
    
    Don't disable -Werror on arm, that doesn't work when QT_ARCH is
    for example armv6. Instead change the condition as the comment says,
    enable -Werror on x86/gcc where we know it passes. On other platforms
    gcc produces difference warnings, and when they're fixed we can add
    them to the whitelist of -Werror-supported architectures.
    
    * WebKit.pri:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68637 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 57b5f5d..cea9120 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-29  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Fix the build on non-x86 platforms with gcc
+
+        Don't disable -Werror on arm, that doesn't work when QT_ARCH is
+        for example armv6. Instead change the condition as the comment says,
+        enable -Werror on x86/gcc where we know it passes. On other platforms
+        gcc produces difference warnings, and when they're fixed we can add
+        them to the whitelist of -Werror-supported architectures.
+
+        * WebKit.pri:
+
 2010-09-28  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit.pri b/WebKit.pri
index 7e525d7..07f84a3 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++*:!isEqual(QT_ARCH,arm): QMAKE_CXXFLAGS += -Werror
+linux-g++*:isEqual(QT_ARCH,x86): QMAKE_CXXFLAGS += -Werror
 
 # Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT
 symbian|*-armcc {

-- 
WebKit Debian packaging