rendered paste bodyIndex: Source/JavaScriptCore/wtf/Platform.h
===================================================================
--- Source/JavaScriptCore/wtf/Platform.h (revision 86477)
+++ Source/JavaScriptCore/wtf/Platform.h (working copy)
@@ -1129,8 +1129,8 @@
/* Use the QXmlStreamReader implementation for XMLDocumentParser */
/* Use the QXmlQuery implementation for XSLTProcessor */
#if PLATFORM(QT)
-#define WTF_USE_QXMLSTREAM 1
-#define WTF_USE_QXMLQUERY 1
+//#define WTF_USE_QXMLSTREAM 1
+//#define WTF_USE_QXMLQUERY 1
#endif
#if PLATFORM(MAC)
Index: Source/WebCore/WebCore.pri
===================================================================
--- Source/WebCore/WebCore.pri (revision 86477)
+++ Source/WebCore/WebCore.pri (working copy)
@@ -165,9 +165,12 @@
}
contains(DEFINES, ENABLE_XSLT=1) {
- QT *= xmlpatterns
+# QT *= xmlpatterns
+PKGCONFIG += libxslt
}
+PKGCONFIG += libxml-2.0
+
contains(DEFINES, ENABLE_SQLITE=1) {
!system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
INCLUDEPATH += $${SQLITE3SRCDIR}
Index: Source/WebCore/WebCore.pro
===================================================================
--- Source/WebCore/WebCore.pro (revision 86477)
+++ Source/WebCore/WebCore.pro (working copy)
@@ -555,7 +555,7 @@
dom/WheelEvent.cpp \
dom/WindowEventContext.cpp \
dom/XMLDocumentParser.cpp \
- dom/XMLDocumentParserQt.cpp \
+# dom/XMLDocumentParserQt.cpp \
dom/default/PlatformMessagePortChannel.cpp \
editing/AppendNodeCommand.cpp \
editing/ApplyBlockElementCommand.cpp \
@@ -3004,10 +3004,31 @@
bindings/js/JSXSLTProcessorCustom.cpp
}
SOURCES += \
- dom/TransformSourceQt.cpp \
- xml/XSLStyleSheetQt.cpp \
+# dom/TransformSourceQt.cpp \
+# xml/XSLStyleSheetQt.cpp \
xml/XSLTProcessor.cpp \
- xml/XSLTProcessorQt.cpp
+ xml/XSLTProcessorLibxslt.cpp \
+# xml/XSLTProcessorQt.cpp
+ dom/TransformSourceLibxslt.cpp \
+ xml/XSLStyleSheetLibxslt.cpp \
+
+
+ HEADERS += \
+ xml/XSLImportRule.h \
+ xml/XSLTExtensions.h \
+ xml/XSLImportRule.h \
+ xml/XSLTUnicodeSort.h \
+ xml/XMLTreeViewer.h \
+ dom/XMLDocumentParserScope.h
+
+ SOURCES += \
+ xml/XSLImportRule.cpp \
+ xml/XSLTExtensions.cpp \
+ xml/XSLImportRule.cpp \
+ xml/XSLTUnicodeSort.cpp \
+ xml/XMLTreeViewer.cpp \
+ dom/XMLDocumentParserLibxml2.cpp \
+ dom/XMLDocumentParserScope.cpp
}
contains(DEFINES, ENABLE_FILTERS=1) {
Index: Source/WebCore/CodeGenerators.pri
===================================================================
--- Source/WebCore/CodeGenerators.pri (revision 86477)
+++ Source/WebCore/CodeGenerators.pri (working copy)
@@ -22,6 +22,10 @@
CSSBISON = $$PWD/css/CSSGrammar.y
+XMLVIEWER_CSS = $$PWD/xml/XMLViewer.css
+
+XMLVIEWER_JS = $$PWD/xml/XMLViewer.js
+
HTML_NAMES = $$PWD/html/HTMLTagNames.in
XML_NAMES = $$PWD/xml/xmlattrs.in
@@ -745,6 +749,26 @@
colordata.depends = $$PWD/make-hash-tools.pl
addExtraCompiler(colordata)
+# GENERATOR 8-D:
+xmlviewercss.output = $${WC_GENERATED_SOURCES_DIR}/XMLViewerCSS.h
+xmlviewercss.input = XMLVIEWER_CSS
+xmlviewercss.wkScript = $$PWD/inspector/xxd.pl
+xmlviewercss.commands = perl $$xmlviewercss.wkScript XMLViewer_css $$XMLVIEWER_CSS $${WC_GENERATED_SOURCES_DIR}/XMLViewerCSS.h
+xmlviewercss.clean = ${QMAKE_FILE_OUT}
+xmlviewercss.depends = $$PWD/inspector/xxd.pl
+xmlviewercss.wkAddOutputToSources = false
+addExtraCompiler(xmlviewercss)
+
+# GENERATOR 8-E:
+xmlviewerjs.output = $${WC_GENERATED_SOURCES_DIR}/XMLViewerJS.h
+xmlviewerjs.input = XMLVIEWER_JS
+xmlviewerjs.wkScript = $$PWD/inspector/xxd.pl
+xmlviewerjs.commands = perl $$xmlviewerjs.wkScript XMLViewer_js $$XMLVIEWER_JS $${WC_GENERATED_SOURCES_DIR}/XMLViewerJS.h
+xmlviewerjs.clean = ${QMAKE_FILE_OUT}
+xmlviewerjs.depends = $$PWD/inspector/xxd.pl
+xmlviewerjs.wkAddOutputToSources = false
+addExtraCompiler(xmlviewerjs)
+
# GENERATOR 9:
stylesheets.wkScript = $$PWD/css/make-css-file-arrays.pl
stylesheets.output = $${WC_GENERATED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp
Index: Source/WebCore/features.pri
===================================================================
--- Source/WebCore/features.pri (revision 86477)
+++ Source/WebCore/features.pri (working copy)
@@ -113,8 +113,10 @@
# XSLT support with QtXmlPatterns
!contains(DEFINES, ENABLE_XSLT=.) {
- contains(QT_CONFIG, xmlpatterns):DEFINES += ENABLE_XSLT=1
- else:DEFINES += ENABLE_XSLT=0
+# contains(QT_CONFIG, xmlpatterns):DEFINES += ENABLE_XSLT=1
+# else:DEFINES += ENABLE_XSLT=0
+ DEFINES += ENABLE_XSLT=1
+
}
# geolocation support if QtMobility exists