[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 695dbb22ad38b486b2c0eddb01a741cc4230d3e6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 22 15:12:33 2010 +0000

    2010-02-22  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Add support for layout tests on Symbian
            https://bugs.webkit.org/show_bug.cgi?id=31589
    
            * WebKit.pro:
    2010-02-22  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Add support for layout tests on Symbian
            https://bugs.webkit.org/show_bug.cgi?id=31589
    
            * DumpRenderTree/qt/DumpRenderTree.pro:
            * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
            * DumpRenderTree/qt/main.cpp:
            (main):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55082 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 7bcf76e..2f6597b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-22  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Add support for layout tests on Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=31589
+
+        * WebKit.pro:
+
 2010-02-20  Noam Rosenthal  <noam.rosenthal at nokia.com>
 
         Reviewed by Laszlo Gombos.
diff --git a/WebKit.pro b/WebKit.pro
index 2dac64f..e9a6b98 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -10,9 +10,8 @@ SUBDIRS += \
 
 !CONFIG(standalone_package) {
     SUBDIRS += JavaScriptCore/jsc.pro \
-        WebKit/qt/tests
-
-    !symbian: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+        WebKit/qt/tests \
+        WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
 
     !win32:!symbian {
         SUBDIRS += WebKitTools/DumpRenderTree/qt/ImageDiff.pro
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e93ffda..05c59d2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-22  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Add support for layout tests on Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=31589
+
+        * DumpRenderTree/qt/DumpRenderTree.pro:
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        * DumpRenderTree/qt/main.cpp:
+        (main):
+
 2010-02-20  Chris Jerdonek  <cjerdonek at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
index ad42bdd..6181662 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
@@ -17,7 +17,7 @@ INCLUDEPATH += ../../../JavaScriptCore/ForwardingHeaders
 INCLUDEPATH += $$BASEDIR
 DESTDIR = ../../../bin
 
-!win32 {
+!win32:!symbian {
     CONFIG += link_pkgconfig
     PKGCONFIG += fontconfig
 }
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 43f1318..e16f9bf 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -66,6 +66,7 @@
 #endif
 
 #include <limits.h>
+#include <locale.h>
 
 #ifndef Q_OS_WIN
 #include <unistd.h>
diff --git a/WebKitTools/DumpRenderTree/qt/main.cpp b/WebKitTools/DumpRenderTree/qt/main.cpp
index 7d72982..2b0ad79 100644
--- a/WebKitTools/DumpRenderTree/qt/main.cpp
+++ b/WebKitTools/DumpRenderTree/qt/main.cpp
@@ -93,7 +93,7 @@ QString get_backtrace() {
     return s;
 }
 
-#ifndef Q_OS_WIN
+#if HAVE(SIGNAL_H)
 static NO_RETURN void crashHandler(int sig)
 {
     fprintf(stderr, "%s\n", strsignal(sig));
@@ -132,7 +132,7 @@ int main(int argc, char* argv[])
     QX11Info::setAppDpiX(0, 96);
 #endif
 
-#ifndef Q_OS_WIN
+#if HAVE(SIGNAL_H)
     signal(SIGILL, crashHandler);    /* 4:   illegal instruction (not reset when caught) */
     signal(SIGTRAP, crashHandler);   /* 5:   trace trap (not reset when caught) */
     signal(SIGFPE, crashHandler);    /* 8:   floating point exception */

-- 
WebKit Debian packaging