Patch from Adam Treat to make the Qt build work without SVG and XSLT as well as

with.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7328da435b77571fe9accfbc7cd74791b7cd7d31..924aefea8298e29b7fbce29965c2f5fc00e8a0a5 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2007-03-23  George Staikos  <staikos@kde.org>
+
+        Reviewed and committed by George.
+
+        Patch from Adam Treat to make the Qt build work without SVG and XSLT.
+        XMLNames is required in any case.
+
+        * WebCore.pro:
+
 2007-03-23  Darin Adler  <darin@apple.com>
 
         Reviewed by Hyatt.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 4ecd6b16ca33263005ad64c65d5de91cc5cc4475..d148f8f7b84c0825967543be70adb6a87ad3374e 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -78,8 +78,6 @@ INCLUDEPATH +=  $$PWD \
                 $$PWD/../WebKitQt/Api \
                 $$PWD/WebCore+SVG
 QT += network
-!mac:CONFIG += link_pkgconfig
-PKGCONFIG += libxslt
 LIBS += -lsqlite3
 
 
@@ -92,6 +90,8 @@ CSSBISON = $$PWD/css/CSSGrammar.y
 
 HTML_NAMES = $$PWD/html/HTMLTagNames.in
 
+XML_NAMES = $$PWD/xml/xmlattrs.in
+
 ENTITIES_GPERF = $$PWD/html/HTMLEntityNames.gperf
 
 COLORDAT_GPERF = $$PWD/platform/ColorData.gperf
@@ -732,6 +732,8 @@ contains(DEFINES, ENABLE_XPATH=1) {
 
 contains(DEFINES, ENABLE_XSLT=1) {
     FEATURE_DEFINES_JAVASCRIPT += ENABLE_XSLT
+    !mac:CONFIG += link_pkgconfig
+    PKGCONFIG += libxslt
 }
 
 contains(DEFINES, ENABLE_XBL=1) {
@@ -743,8 +745,6 @@ contains(DEFINES, ENABLE_SVG=1) {
 
     SVG_NAMES = $$PWD/ksvg2/svg/svgtags.in
 
-    XML_NAMES = $$PWD/xml/xmlattrs.in
-
     XLINK_NAMES = $$PWD/ksvg2/misc/xlinkattrs.in
 
     IDL_BINDINGS += ksvg2/events/SVGZoomEvent.idl \
@@ -1054,7 +1054,7 @@ contains(DEFINES, ENABLE_SVG=1) {
         rendering/SVGInlineTextBox.cpp \
         rendering/SVGRootInlineBox.cpp
 
-        # GENERATOR 5-B:
+        # GENERATOR 5-C:
         svgnames_a.output = tmp/SVGNames.cpp
         svgnames_a.commands = perl $$PWD/ksvg2/scripts/make_names.pl --tags $$PWD/ksvg2/svg/svgtags.in --attrs $$PWD/ksvg2/svg/svgattrs.in --namespace SVG --cppNamespace WebCore --namespaceURI 'http://www.w3.org/2000/svg' --factory --attrsNullNamespace --output tmp
         svgnames_a.input = SVG_NAMES
@@ -1072,7 +1072,7 @@ contains(DEFINES, ENABLE_SVG=1) {
         svgnames_b.clean += tmp/SVGElementFactory.h ${QMAKE_FILE_OUT}
         QMAKE_EXTRA_COMPILERS += svgnames_b
 
-        # GENERATOR 5-C:
+        # GENERATOR 5-D:
         xlinknames.output = tmp/XLinkNames.cpp
         xlinknames.commands = perl $$PWD/ksvg2/scripts/make_names.pl --attrs $$PWD/ksvg2/misc/xlinkattrs.in --namespace XLink --cppNamespace WebCore --namespaceURI 'http://www.w3.org/1999/xlink' --output tmp
         xlinknames.input = XLINK_NAMES
@@ -1081,16 +1081,6 @@ contains(DEFINES, ENABLE_SVG=1) {
         xlinknames.variable_out = GENERATED_SOURCES
         xlinknames.clean = ${QMAKE_FILE_OUT} tmp/XLinkNames.h
         QMAKE_EXTRA_COMPILERS += xlinknames
-
-        # GENERATOR 5-D:
-        xmlnames.output = tmp/XMLNames.cpp
-        xmlnames.commands = perl $$PWD/ksvg2/scripts/make_names.pl --attrs $$PWD/xml/xmlattrs.in --namespace XML --cppNamespace WebCore --namespaceURI 'http://www.w3.org/XML/1998/namespace' --output tmp
-        xmlnames.input = XML_NAMES
-        xmlnames.dependency_type = TYPE_C
-        xmlnames.CONFIG = target_predeps
-        xmlnames.variable_out = GENERATED_SOURCES
-        xmlnames.clean = ${QMAKE_FILE_OUT} tmp/XMLNames.h
-        QMAKE_EXTRA_COMPILERS += xmlnames
 }
 
 
@@ -1153,6 +1143,16 @@ htmlnames.variable_out = GENERATED_SOURCES
 htmlnames.clean = ${QMAKE_FILE_OUT} tmp/HTMLNames.h
 QMAKE_EXTRA_COMPILERS += htmlnames
 
+# GENERATOR 5-B:
+xmlnames.output = tmp/XMLNames.cpp
+xmlnames.commands = perl $$PWD/ksvg2/scripts/make_names.pl --attrs $$PWD/xml/xmlattrs.in --namespace XML --cppNamespace WebCore --namespaceURI 'http://www.w3.org/XML/1998/namespace' --output tmp
+xmlnames.input = XML_NAMES
+xmlnames.dependency_type = TYPE_C
+xmlnames.CONFIG = target_predeps
+xmlnames.variable_out = GENERATED_SOURCES
+xmlnames.clean = ${QMAKE_FILE_OUT} tmp/XMLNames.h
+QMAKE_EXTRA_COMPILERS += xmlnames
+
 # GENERATOR 6-A:
 cssprops.output = tmp/CSSPropertyNames.c
 cssprops.input = WALDOCSSPROPS