[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 4bc9ef23407a3bc47a141cd07ad863d312f57f68
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 24 14:26:14 2010 +0000

    [Qt] Fix the Wince build.
    
    Patch by Romain Pokrzywka <romain at kdab.com> on 2010-09-24
    Reviewed by Simon Hausmann.
    
    .:
    
    * WebKit.pri: Apply msvc flags to wince, too.
    
    WebCore:
    
    * WebCore.pro: Apply msvc flags to wince, too.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68251 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index d8bc7a9..471f196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-24  Romain Pokrzywka  <romain at kdab.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix the Wince build.
+
+        * WebKit.pri: Apply msvc flags to wince, too.
+
 2010-09-23  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
 
         Reviewed by Antonio Gomes.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e00678f..663acdd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-24  Romain Pokrzywka  <romain at kdab.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix the Wince build.
+
+        * WebCore.pro: Apply msvc flags to wince, too.
+
 2010-09-24  Anders Bakken  <agbakken at gmail.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 4b9ceb1..1fde685 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -128,7 +128,7 @@ CONFIG(release):!CONFIG(standalone_package) {
 DEFINES += BUILD_WEBKIT
 
 # Remove whole program optimizations due to miscompilations
-win32-msvc2005|win32-msvc2008:{
+win32-msvc2005|win32-msvc2008|wince*:{
     QMAKE_CFLAGS_RELEASE -= -GL
     QMAKE_CXXFLAGS_RELEASE -= -GL
 }
diff --git a/WebKit.pri b/WebKit.pri
index 097832b..7e525d7 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -103,5 +103,5 @@ contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools
 
 # Disable a few warnings on Windows. The warnings are also
 # disabled in WebKitLibraries/win/tools/vsprops/common.vsprops
-win32-msvc*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996
+win32-msvc*|wince*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996
 

-- 
WebKit Debian packaging