Diff
Modified: trunk/Tools/ChangeLog (114239 => 114240)
--- trunk/Tools/ChangeLog 2012-04-16 11:32:13 UTC (rev 114239)
+++ trunk/Tools/ChangeLog 2012-04-16 11:44:41 UTC (rev 114240)
@@ -1,3 +1,22 @@
+2012-04-16 Andras Piroska <pand...@inf.u-szeged.hu>
+
+ [Qt] Replace QtXmlPatterns usage with libxslt dependency
+ <https://bugs.webkit.org/show_bug.cgi?id=76820>
+
+ Reviewed by Simon Hausmann.
+
+ The features.prf file was modified, in order to use libxml and libxslt by default.
+ This modification only work at Qt5.
+
+ * qmake/config.tests/libxml2/libxml2.cpp: Added.
+ (main):
+ * qmake/config.tests/libxml2/libxml2.pro: Added.
+ * qmake/config.tests/libxslt/libxslt.cpp: Added.
+ (main):
+ * qmake/config.tests/libxslt/libxslt.pro: Added.
+ * qmake/mkspecs/features/features.prf:
+ * qmake/sync.profile:
+
2012-04-16 Seokju Kwon <seokju.k...@samsung.com>
[EFL] EWebLaucher : Fix wrong parameter order in function call for multiple windows.
Added: trunk/Tools/qmake/config.tests/libxml2/libxml2.cpp (0 => 114240)
--- trunk/Tools/qmake/config.tests/libxml2/libxml2.cpp (rev 0)
+++ trunk/Tools/qmake/config.tests/libxml2/libxml2.cpp 2012-04-16 11:44:41 UTC (rev 114240)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2011 University of Szeged. All rights reserved.
+ *
+ * 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 <libxml2/libxml/xmlreader.h>
+
+int main(int, char**)
+{
+ xmlTextReaderSetup(0, 0, 0, 0, 0);
+ return 0;
+}
+
Added: trunk/Tools/qmake/config.tests/libxml2/libxml2.pro (0 => 114240)
--- trunk/Tools/qmake/config.tests/libxml2/libxml2.pro (rev 0)
+++ trunk/Tools/qmake/config.tests/libxml2/libxml2.pro 2012-04-16 11:44:41 UTC (rev 114240)
@@ -0,0 +1,4 @@
+CONFIG -= qt
+SOURCES = libxml2.cpp
+CONFIG += link_pkgconfig
+PKGCONFIG += libxml-2.0
Added: trunk/Tools/qmake/config.tests/libxslt/libxslt.cpp (0 => 114240)
--- trunk/Tools/qmake/config.tests/libxslt/libxslt.cpp (rev 0)
+++ trunk/Tools/qmake/config.tests/libxslt/libxslt.cpp 2012-04-16 11:44:41 UTC (rev 114240)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2011 University of Szeged. All rights reserved.
+ *
+ * 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 <libxslt/xsltutils.h>
+
+int main(int, char**)
+{
+ xslAddCall(0, 0);
+ return 0;
+}
+
Added: trunk/Tools/qmake/config.tests/libxslt/libxslt.pro (0 => 114240)
--- trunk/Tools/qmake/config.tests/libxslt/libxslt.pro (rev 0)
+++ trunk/Tools/qmake/config.tests/libxslt/libxslt.pro 2012-04-16 11:44:41 UTC (rev 114240)
@@ -0,0 +1,4 @@
+CONFIG -= qt
+SOURCES = libxslt.cpp
+CONFIG += link_pkgconfig
+PKGCONFIG += libxslt
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (114239 => 114240)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-04-16 11:32:13 UTC (rev 114239)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-04-16 11:44:41 UTC (rev 114240)
@@ -65,6 +65,16 @@
}
}
+# We need libxml2 config test to determine to use libxml2 or not
+!contains(DEFINES, WTF_USE_LIBXML2=.) {
+ haveQt(5):contains(config_test_libxml2, yes): DEFINES += WTF_USE_LIBXML2=1
+}
+
+# We need libxslt config test to determine to use libxslt or not
+!contains(DEFINES, ENABLE_XSLT=.) {
+ haveQt(5):contains(config_test_libxslt, yes): DEFINES += ENABLE_XSLT=1
+}
+
# Feature defines: for web-facing features only
!contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=.): DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=1
!contains(DEFINES, ENABLE_GAMEPAD=.): DEFINES += ENABLE_GAMEPAD=0
Modified: trunk/Tools/qmake/sync.profile (114239 => 114240)
--- trunk/Tools/qmake/sync.profile 2012-04-16 11:32:13 UTC (rev 114239)
+++ trunk/Tools/qmake/sync.profile 2012-04-16 11:44:41 UTC (rev 114240)
@@ -4,4 +4,6 @@
gccdepends => {},
libpng => {},
libjpeg => {},
+ libxml2 => {},
+ libxslt => {},
);
