Diff
Modified: trunk/LayoutTests/ChangeLog (120192 => 120193)
--- trunk/LayoutTests/ChangeLog 2012-06-13 12:48:26 UTC (rev 120192)
+++ trunk/LayoutTests/ChangeLog 2012-06-13 12:52:53 UTC (rev 120193)
@@ -1,3 +1,15 @@
+2012-06-13 Qi Zhang <[email protected]>
+
+ [Qt] Add configure test for zlib and set WTF_USE_ZLIB if found
+ https://bugs.webkit.org/show_bug.cgi?id=88763
+
+ Move failed websocket extension test case to qt-4.8 after enable it in qt5
+
+ Reviewed by Simon Hausmann.
+
+ * platform/qt-4.8/Skipped:
+ * platform/qt/Skipped:
+
2012-06-13 Christophe Dumez <[email protected]>
[EFL] http/tests/xmlhttprequest/origin-exact-matching.html can be unskipped
Modified: trunk/LayoutTests/platform/qt/Skipped (120192 => 120193)
--- trunk/LayoutTests/platform/qt/Skipped 2012-06-13 12:48:26 UTC (rev 120192)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-06-13 12:52:53 UTC (rev 120193)
@@ -332,13 +332,6 @@
fast/mutation/takeRecords.html
fast/mutation/transient-gc-crash.html
-# USE(ZLIB) is disabled.
-http/tests/websocket/tests/hybi/compressed-control-frame.html
-http/tests/websocket/tests/hybi/deflate-frame-invalid-parameter.html
-http/tests/websocket/tests/hybi/deflate-frame-parameter.html
-http/tests/websocket/tests/hybi/extensions.html
-http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header.html
-
# Disable private names by default in WebCore
# https://bugs.webkit.org/show_bug.cgi?id=87088
fast/js/names.html
Modified: trunk/LayoutTests/platform/qt-4.8/Skipped (120192 => 120193)
--- trunk/LayoutTests/platform/qt-4.8/Skipped 2012-06-13 12:48:26 UTC (rev 120192)
+++ trunk/LayoutTests/platform/qt-4.8/Skipped 2012-06-13 12:52:53 UTC (rev 120193)
@@ -47,6 +47,17 @@
#################################################
#################################################
+# Moved from qt/Skipped after:
+# [Qt] Add configure test for zlib and set WTF_USE_ZLIB if found
+# USE(ZLIB) is disabled.
+http/tests/websocket/tests/hybi/compressed-control-frame.html
+http/tests/websocket/tests/hybi/deflate-frame-invalid-parameter.html
+http/tests/websocket/tests/hybi/deflate-frame-parameter.html
+http/tests/websocket/tests/hybi/extensions.html
+http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header.html
+#################################################
+
+#################################################
# Tests failing on WK1 only (working on WK2) - copied from the old qt-wk1/Skipped list
# New test introduced in r102048 fails on Qt-WK1
Modified: trunk/Source/WebCore/WebCore.pri (120192 => 120193)
--- trunk/Source/WebCore/WebCore.pri 2012-06-13 12:48:26 UTC (rev 120192)
+++ trunk/Source/WebCore/WebCore.pri 2012-06-13 12:52:53 UTC (rev 120193)
@@ -136,6 +136,10 @@
PKGCONFIG += libxml-2.0
}
+contains(DEFINES, WTF_USE_ZLIB=1) {
+ LIBS += -lz
+}
+
contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
unix {
mac {
Modified: trunk/Tools/ChangeLog (120192 => 120193)
--- trunk/Tools/ChangeLog 2012-06-13 12:48:26 UTC (rev 120192)
+++ trunk/Tools/ChangeLog 2012-06-13 12:52:53 UTC (rev 120193)
@@ -1,3 +1,20 @@
+2012-06-13 Qi Zhang <[email protected]>
+
+ [Qt] Add configure test for zlib and set WTF_USE_ZLIB if found
+ https://bugs.webkit.org/show_bug.cgi?id=88763
+
+ Add configure test for zlib and set WTF_USE_ZLIB if found to enable websocket
+ extension.
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/config.tests/libzlib: Added.
+ * qmake/config.tests/libzlib/libzlib.cpp: Added.
+ (main):
+ * qmake/config.tests/libzlib/libzlib.pro: Added.
+ * qmake/mkspecs/features/features.prf:
+ * qmake/sync.profile:
+
2012-06-13 Robin Cao <[email protected]>
[BlackBerry] Enable MEDIA_STREAM by default
Added: trunk/Tools/qmake/config.tests/libzlib/libzlib.cpp (0 => 120193)
--- trunk/Tools/qmake/config.tests/libzlib/libzlib.cpp (rev 0)
+++ trunk/Tools/qmake/config.tests/libzlib/libzlib.cpp 2012-06-13 12:52:53 UTC (rev 120193)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <zlib.h>
+
+int main(int, char**)
+{
+ (void)zlibVersion();
+ return 0;
+}
Added: trunk/Tools/qmake/config.tests/libzlib/libzlib.pro (0 => 120193)
--- trunk/Tools/qmake/config.tests/libzlib/libzlib.pro (rev 0)
+++ trunk/Tools/qmake/config.tests/libzlib/libzlib.pro 2012-06-13 12:52:53 UTC (rev 120193)
@@ -0,0 +1,3 @@
+SOURCES = libzlib.cpp
+OBJECTS_DIR = obj
+LIBS += -lz
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (120192 => 120193)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-06-13 12:48:26 UTC (rev 120192)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-06-13 12:52:53 UTC (rev 120193)
@@ -73,6 +73,11 @@
haveQt(5):contains(config_test_libxslt, yes): DEFINES += ENABLE_XSLT=1
}
+# We need libzlib config test to determine to use enable websocket extension or not
+!contains(DEFINES, WTF_USE_ZLIB=.) {
+ haveQt(5):contains(config_test_libzlib, yes): DEFINES += WTF_USE_ZLIB=1
+}
+
!contains(DEFINES, WTF_USE_QT_IMAGE_DECODER=.): DEFINES += WTF_USE_QT_IMAGE_DECODER=1
# Tiled Backing Store support
Modified: trunk/Tools/qmake/sync.profile (120192 => 120193)
--- trunk/Tools/qmake/sync.profile 2012-06-13 12:48:26 UTC (rev 120192)
+++ trunk/Tools/qmake/sync.profile 2012-06-13 12:52:53 UTC (rev 120193)
@@ -7,4 +7,5 @@
libwebp => {},
libxml2 => {},
libxslt => {},
+ libzlib => {},
);
