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

[abecsi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e4f5a8bd2254abbd96c402b8778928076a986ace
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 13:18:19 2010 +0000

    2010-10-14  Andras Becsi  <abecsi at webkit.org>
    
            Reviewed by Csaba Osztrogonác.
    
            [Qt] Fix -Werror after r68637 on x86 platforms.
            Qt's build system sets QT_ARCH statically to i386 or x86_64 accordingly,
            so check for this instead of only checking for x86.
    
            * WebKit.pri:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69762 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index b3df238..eac1feb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-14  Andras Becsi  <abecsi at webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Fix -Werror after r68637 on x86 platforms.
+        Qt's build system sets QT_ARCH statically to i386 or x86_64 accordingly,
+        so check for this instead of only checking for x86.
+
+        * WebKit.pri:
+
 2010-10-13  Sergio Villar Senin  <svillar at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit.pri b/WebKit.pri
index 93be962..282f866 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -67,7 +67,9 @@ 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,x86): QMAKE_CXXFLAGS += -Werror
+linux-g++* {
+    isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
+}
 
 # Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT
 symbian|*-armcc {

-- 
WebKit Debian packaging