[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

yael.aharon at nokia.com yael.aharon at nokia.com
Thu Apr 8 00:20:05 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 792bb0b2183046f80abab326e99dc8aea9eedd9d
Author: yael.aharon at nokia.com <yael.aharon at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 4 21:35:33 2009 +0000

    Unreviewed build fix.
    
    [Qt] build fix after r51634 removed unused QBoxLayout include which included limits.h.
    
    * DumpRenderTree/qt/DumpRenderTree.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51713 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7e439f4..c35d075 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-04  Yael Aharon  <yael.aharon at nokia.com>
+
+        Unreviewed build fix.
+
+        [Qt] build fix after r51634 removed unused QBoxLayout include which included limits.h.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+
 2009-12-04  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Reviewed by Adam Treat.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index ff06dbe..c118543 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -64,9 +64,7 @@
 #include <fontconfig/fontconfig.h>
 #endif
 
-#if PLATFORM(ARM) && PLATFORM(LINUX)
 #include <limits.h>
-#endif
 
 #include <unistd.h>
 #include <qdebug.h>

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list