[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
zoltan at webkit.org
zoltan at webkit.org
Tue Jan 5 23:41:39 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 19ffa3a039e69321d6dcbf01e8135bbf353819bd
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 3 17:06:04 2009 +0000
Unreviewed build fix.
Patch by Andras Becsi <abecsi at inf.u-szeged.hu> on 2009-12-03
[Qt] ARM-Linux build fix after r51634 removed unused QBoxLayout include which included limits.h on ARM.
* DumpRenderTree/qt/DumpRenderTree.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51639 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index cf082ce..c7d8ca5 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,13 @@
2009-12-03 Andras Becsi <abecsi at inf.u-szeged.hu>
+ Unreviewed build fix.
+
+ [Qt] ARM-Linux build fix after r51634 removed unused QBoxLayout include which included limits.h on ARM.
+
+ * DumpRenderTree/qt/DumpRenderTree.cpp:
+
+2009-12-03 Andras Becsi <abecsi at inf.u-szeged.hu>
+
Reviewed by Kenneth Rohde Christiansen.
[Qt] Refactor DRT to not crash on tests which open child windows from javascript.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index b05938c..a49be44 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -29,6 +29,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "config.h"
+
#include "DumpRenderTree.h"
#include "EventSenderQt.h"
#include "LayoutTestControllerQt.h"
@@ -62,6 +64,10 @@
#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