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

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 61c2cdb2d92f1634ddb82bc1390542c1cd929061
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 16:35:40 2010 +0000

    Unreviewed buildfix after r66972.
    
    [Qt] Treat warnings as errors by default for gcc
    https://bugs.webkit.org/show_bug.cgi?id=43191
    
    * WebKit.pri: Don't add -Werror for maemo platforms.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66990 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index f262075..6face08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-08  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Unreviewed buildfix after r66972.
+
+        [Qt] Treat warnings as errors by default for gcc
+        https://bugs.webkit.org/show_bug.cgi?id=43191
+
+        * WebKit.pri: Don't add -Werror for maemo platforms.
+
 2010-09-08  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit.pri b/WebKit.pri
index 6969ff4..faa141d 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++*: QMAKE_CXXFLAGS += -Werror
+linux-g++*:!maemo5:!maemo6: QMAKE_CXXFLAGS += -Werror
 
 # Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT
 symbian|*-armcc {

-- 
WebKit Debian packaging