[Qt] Replace QtXmlPatterns usage with libxslt dependency

<https://bugs.webkit.org/show_bug.cgi?id=76820>

Patch by Andras Piroska <pandras@inf.u-szeged.hu> on 2012-04-16
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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114240 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 29270ef..dfe8b2f 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,22 @@
+2012-04-16  Andras Piroska  <pandras@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.kwon@samsung.com>
 
         [EFL] EWebLaucher : Fix wrong parameter order in function call for multiple windows.

diff --git a/Tools/qmake/config.tests/libxml2/libxml2.cpp b/Tools/qmake/config.tests/libxml2/libxml2.cpp
new file mode 100644 (file)
index 0000000..dfde5a3
--- /dev/null
+++ b/Tools/qmake/config.tests/libxml2/libxml2.cpp
@@ -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;
+}
+

diff --git a/Tools/qmake/config.tests/libxml2/libxml2.pro b/Tools/qmake/config.tests/libxml2/libxml2.pro
new file mode 100644 (file)
index 0000000..d5add8f
--- /dev/null
+++ b/Tools/qmake/config.tests/libxml2/libxml2.pro
@@ -0,0 +1,4 @@
+CONFIG -= qt
+SOURCES = libxml2.cpp
+CONFIG += link_pkgconfig
+PKGCONFIG += libxml-2.0

diff --git a/Tools/qmake/config.tests/libxslt/libxslt.cpp b/Tools/qmake/config.tests/libxslt/libxslt.cpp
new file mode 100644 (file)
index 0000000..a1dedb3
--- /dev/null
+++ b/Tools/qmake/config.tests/libxslt/libxslt.cpp
@@ -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;
+}
+

diff --git a/Tools/qmake/config.tests/libxslt/libxslt.pro b/Tools/qmake/config.tests/libxslt/libxslt.pro
new file mode 100644 (file)
index 0000000..6359de3
--- /dev/null
+++ b/Tools/qmake/config.tests/libxslt/libxslt.pro
@@ -0,0 +1,4 @@
+CONFIG -= qt
+SOURCES = libxslt.cpp
+CONFIG += link_pkgconfig
+PKGCONFIG += libxslt

diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index 4053e98..8f6175e 100644 (file)
--- a/Tools/qmake/mkspecs/features/features.prf
+++ b/Tools/qmake/mkspecs/features/features.prf
@@ -65,6 +65,16 @@ haveQt(5) {
     }
 }
 
+# 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

diff --git a/Tools/qmake/sync.profile b/Tools/qmake/sync.profile
index 661831f..c073460 100644 (file)
--- a/Tools/qmake/sync.profile
+++ b/Tools/qmake/sync.profile
@@ -4,4 +4,6 @@
     gccdepends => {},
     libpng => {},
     libjpeg => {},
+    libxml2 => {},
+    libxslt => {},
 );