summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2012-11-22 16:35:24 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-23 13:16:20 +0100
commit051aeb291646745559c47da160193bdcbd34ef2b (patch)
tree50040152b4dfe22238ef0446c9e57ff1b345bdd4
parentb34af22fcc7e9321e5a7943763cd68a1d51a36d5 (diff)
downloadqtxmlpatterns-051aeb291646745559c47da160193bdcbd34ef2b.tar.gz
Doc: Modularized Qt XML Patterns documentation.
-moved snippets, images, documentation to src/xmlpatterns -fixed \snippet tag -ported module information from qtdoc repository -enabled "make docs" for the module -set up qdocconf file and .index file -updated tests/auto/patternistexamples to point to the new snippet locations Change-Id: Ifd10733c277c6dbacac42898c8e7bacd00d23f27 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-rw-r--r--doc/qt5-dita.qdocconf22
-rw-r--r--doc/qt5.qdocconf72
-rw-r--r--doc/style/style.css137
-rw-r--r--examples/xmlpatterns/filetree/doc/src/filetree.qdoc (renamed from doc/src/examples/filetree.qdoc)0
-rw-r--r--examples/xmlpatterns/recipes/doc/src/recipes.qdoc (renamed from doc/src/examples/recipes.qdoc)0
-rw-r--r--examples/xmlpatterns/schema/doc/src/schema.qdoc (renamed from doc/src/examples/schema.qdoc)0
-rw-r--r--examples/xmlpatterns/trafficinfo/doc/src/trafficinfo.qdoc (renamed from doc/src/examples/trafficinfo.qdoc)0
-rw-r--r--examples/xmlpatterns/xquery/doc/src/globalVariables.qdoc (renamed from doc/src/examples/globalVariables.qdoc)0
-rw-r--r--src/xmlpatterns/doc/images/filetree_1-example.png (renamed from doc/src/images/filetree_1-example.png)bin116931 -> 116931 bytes
-rw-r--r--src/xmlpatterns/doc/images/filetree_2-example.png (renamed from doc/src/images/filetree_2-example.png)bin121356 -> 121356 bytes
-rw-r--r--src/xmlpatterns/doc/images/patternist-wordProcessor.png (renamed from doc/src/images/patternist-wordProcessor.png)bin10264 -> 10264 bytes
-rw-r--r--src/xmlpatterns/doc/images/recipes-example.png (renamed from doc/src/images/recipes-example.png)bin44457 -> 44457 bytes
-rw-r--r--src/xmlpatterns/doc/images/schema-example.png (renamed from doc/src/images/schema-example.png)bin84320 -> 84320 bytes
-rw-r--r--src/xmlpatterns/doc/images/trafficinfo-example.png (renamed from doc/src/images/trafficinfo-example.png)bin28082 -> 28082 bytes
-rw-r--r--src/xmlpatterns/doc/qtxmlpatterns.qdocconf46
-rw-r--r--src/xmlpatterns/doc/snippets/code/doc_src_qtxmlpatterns.qdoc (renamed from doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc)0
-rw-r--r--src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp (renamed from doc/src/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp)0
-rw-r--r--src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp (renamed from doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp)0
-rw-r--r--src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp (renamed from doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp)0
-rw-r--r--src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp (renamed from doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp)0
-rw-r--r--src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp (renamed from doc/src/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp)0
-rw-r--r--src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp (renamed from doc/src/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp)0
-rw-r--r--src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlname.cpp (renamed from doc/src/snippets/code/src_xmlpatterns_api_qxmlname.cpp)0
-rw-r--r--src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlquery.cpp (renamed from doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp)0
-rw-r--r--src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp (renamed from doc/src/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp)0
-rw-r--r--src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp (renamed from doc/src/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp)0
-rw-r--r--src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp44
-rw-r--r--src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.pro44
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/anyHTMLElement.xq (renamed from doc/src/snippets/patternist/anyHTMLElement.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/anyXLinkAttribute.xq (renamed from doc/src/snippets/patternist/anyXLinkAttribute.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/bracesIncluded.xq (renamed from doc/src/snippets/patternist/bracesIncluded.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/bracesIncludedResult.xml (renamed from doc/src/snippets/patternist/bracesIncludedResult.xml)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/bracesOmitted.xq (renamed from doc/src/snippets/patternist/bracesOmitted.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/bracesOmittedResult.xml (renamed from doc/src/snippets/patternist/bracesOmittedResult.xml)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/computedTreeFragment.xq (renamed from doc/src/snippets/patternist/computedTreeFragment.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/copyAttribute.xq (renamed from doc/src/snippets/patternist/copyAttribute.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/copyID.xq (renamed from doc/src/snippets/patternist/copyID.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/directTreeFragment.xq (renamed from doc/src/snippets/patternist/directTreeFragment.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/doc.txt (renamed from doc/src/snippets/patternist/doc.txt)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/docPlainHTML.xq (renamed from doc/src/snippets/patternist/docPlainHTML.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/docPlainHTML2.xq (renamed from doc/src/snippets/patternist/docPlainHTML2.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/embedDataInXHTML.xq (renamed from doc/src/snippets/patternist/embedDataInXHTML.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/embedDataInXHTML2.xq (renamed from doc/src/snippets/patternist/embedDataInXHTML2.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/emptyParagraphs.xq (renamed from doc/src/snippets/patternist/emptyParagraphs.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/escapeCurlyBraces.xq (renamed from doc/src/snippets/patternist/escapeCurlyBraces.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/escapeStringLiterals.xml (renamed from doc/src/snippets/patternist/escapeStringLiterals.xml)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/escapeStringLiterals.xq (renamed from doc/src/snippets/patternist/escapeStringLiterals.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/expressionInsideAttribute.xq (renamed from doc/src/snippets/patternist/expressionInsideAttribute.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/filterOnPath.xq (renamed from doc/src/snippets/patternist/filterOnPath.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/filterOnStep.xq (renamed from doc/src/snippets/patternist/filterOnStep.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/firstParagraph.xq (renamed from doc/src/snippets/patternist/firstParagraph.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/fnStringOnAttribute.xq (renamed from doc/src/snippets/patternist/fnStringOnAttribute.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/forClause.xq (renamed from doc/src/snippets/patternist/forClause.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/forClause2.xq (renamed from doc/src/snippets/patternist/forClause2.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/forClauseOnFeed.xq (renamed from doc/src/snippets/patternist/forClauseOnFeed.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/indented.xml (renamed from doc/src/snippets/patternist/indented.xml)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/introAcneRemover.xq (renamed from doc/src/snippets/patternist/introAcneRemover.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/introExample2.xq (renamed from doc/src/snippets/patternist/introExample2.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/introFileHierarchy.xml (renamed from doc/src/snippets/patternist/introFileHierarchy.xml)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/introNavigateFS.xq (renamed from doc/src/snippets/patternist/introNavigateFS.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/introductionExample.xq (renamed from doc/src/snippets/patternist/introductionExample.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/invalidLetOrderBy.xq (renamed from doc/src/snippets/patternist/invalidLetOrderBy.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/items.xq (renamed from doc/src/snippets/patternist/items.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/letOrderBy.xq (renamed from doc/src/snippets/patternist/letOrderBy.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/literalsAndOperators.xq (renamed from doc/src/snippets/patternist/literalsAndOperators.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/mobeyDick.xml (renamed from doc/src/snippets/patternist/mobeyDick.xml)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/nextLastParagraph.xq (renamed from doc/src/snippets/patternist/nextLastParagraph.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/nodeConstructorsAreExpressions.xq (renamed from doc/src/snippets/patternist/nodeConstructorsAreExpressions.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/nodeConstructorsInPaths.xq (renamed from doc/src/snippets/patternist/nodeConstructorsInPaths.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/nodeTestChildElement.xq (renamed from doc/src/snippets/patternist/nodeTestChildElement.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/notIndented.xml (renamed from doc/src/snippets/patternist/notIndented.xml)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/oneElementConstructor.xq (renamed from doc/src/snippets/patternist/oneElementConstructor.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/paragraphsExceptTheFiveFirst.xq (renamed from doc/src/snippets/patternist/paragraphsExceptTheFiveFirst.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/paragraphsWithTables.xq (renamed from doc/src/snippets/patternist/paragraphsWithTables.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/pathAB.xq (renamed from doc/src/snippets/patternist/pathAB.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/pathsAllParagraphs.xq (renamed from doc/src/snippets/patternist/pathsAllParagraphs.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/simpleHTML.xq (renamed from doc/src/snippets/patternist/simpleHTML.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/simpleXHTML.xq (renamed from doc/src/snippets/patternist/simpleXHTML.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/svgDocumentElement.xml (renamed from doc/src/snippets/patternist/svgDocumentElement.xml)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/tablesInParagraphs.xq (renamed from doc/src/snippets/patternist/tablesInParagraphs.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/twoSVGElements.xq (renamed from doc/src/snippets/patternist/twoSVGElements.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/xmlStylesheet.xq (renamed from doc/src/snippets/patternist/xmlStylesheet.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/xsBooleanTrue.xq (renamed from doc/src/snippets/patternist/xsBooleanTrue.xq)0
-rw-r--r--src/xmlpatterns/doc/snippets/patternist/xsvgDocumentElement.xml (renamed from doc/src/snippets/patternist/xsvgDocumentElement.xml)0
-rw-r--r--src/xmlpatterns/doc/snippets/qxmlquery/bindingExample.cpp (renamed from doc/src/snippets/qxmlquery/bindingExample.cpp)0
-rw-r--r--src/xmlpatterns/doc/snippets/qxmlschema/main.cpp (renamed from doc/src/snippets/qxmlschema/main.cpp)0
-rw-r--r--src/xmlpatterns/doc/snippets/qxmlschemavalidator/main.cpp (renamed from doc/src/snippets/qxmlschemavalidator/main.cpp)0
-rw-r--r--src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc112
-rw-r--r--src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc48
-rw-r--r--src/xmlpatterns/doc/src/xml-patterns.qdoc (renamed from doc/src/xml-processing/xml-patterns.qdoc)2
-rw-r--r--src/xmlpatterns/doc/src/xquery-introduction.qdoc (renamed from doc/src/xml-processing/xquery-introduction.qdoc)0
-rw-r--r--src/xmlpatterns/xmlpatterns.pro2
-rw-r--r--tests/auto/patternistexamples/tst_patternistexamples.cpp22
93 files changed, 307 insertions, 244 deletions
diff --git a/doc/qt5-dita.qdocconf b/doc/qt5-dita.qdocconf
deleted file mode 100644
index d9703e1..0000000
--- a/doc/qt5-dita.qdocconf
+++ /dev/null
@@ -1,22 +0,0 @@
-# Name of the project.
-project = projectname
-
-# Directories in which to search for files to document and images.
-# By default set to the root directory of the project for sources
-# and headers and qdoc will therefore generate output for each file.
-# Images should be placed in <rootdir>/dic/images and examples in
-# <rootdir>/examples.
-# Paths are relative to the location of this file.
-exampledirs += .
-headerdirs += ..
-sourcedirs += ..
-
-
-
-#Do not change the variables after this line unless you know what you are doing.
-
-outputdir = ditaxml
-outputformats = DITAXML
-
-sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
-headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx"
diff --git a/doc/qt5.qdocconf b/doc/qt5.qdocconf
deleted file mode 100644
index cf33db8..0000000
--- a/doc/qt5.qdocconf
+++ /dev/null
@@ -1,72 +0,0 @@
-include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
-
-# Name of the project.
-project = QtXmlPatterns
-
-# Directories in which to search for files to document and images.
-# By default set to the root directory of the project for sources
-# and headers and qdoc will therefore generate output for each file.
-# Images should be placed in <rootdir>/dic/images and examples in
-# <rootdir>/examples.
-# Paths are relative to the location of this file.
-exampledirs += src \
- ../examples\
- src/snippets
-headerdirs += ..
-imagedirs += images
-sourcedirs += ..
-excludedirs += ../tests/auto \
- ../tools
-
-# The following parameters are for creating a qhp file, the qhelpgenerator
-# program can convert the qhp file into a qch file which can be opened in
-# Qt Assistant and/or Qt Creator.
-
-# Defines the name of the project. You cannot use operators (+, =, -) in
-# the name. Properties for this project are set using a qhp.<projectname>.property
-# format.
-qhp.projects = qtxmlpatterns
-
-# Sets the name of the output qhp file.
-qhp.qtxmlpatterns.file = projectname.qhp
-
-# Namespace for the output file. This namespace is used to distinguish between
-# different documentation files in Creator/Assistant.
-qhp.qtxmlpatterns.namespace = com.nokia.mp.projectname.100
-
-# Title for the package, will be the main title for the package in
-# Assistant/Creator.
-qhp.qtxmlpatterns.indexTitle = Qt XMLPatterns Documentation
-
-# Extra files to add to the output which are not linked to from anywhere
-# using a qdoc \l command.
-qhp.qtxmlpatterns.extraFiles = style/style.css \
- index.html
-
-# Only updtae the name of the project for the next variables.
-qhp.qtxmlpatterns.virtualFolder = qdoc
-qhp.qtxmlpatterns.subprojects = classes
-qhp.qtxmlpatterns.subprojects.classes.title = Classes
-qhp.qtxmlpatterns.subprojects.classes.selectors = class fake:headerfile
-qhp.qtxmlpatterns.subprojects.classes.sortPages = true
-
-
-
-# Do NOT change the variables after this line unless you know what you are doing.
-
-outputformats = HTML
-
-examples.fileextensions = "*.cpp *.h *.js *.svg *.xml *.ui *.qml"
-examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng"
-headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx"
-sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
-
-HTML.nobreadcrumbs = "true"
-
-HTML.templatedir = .
-HTML.stylesheets = style/style.css
-
-HTML.headerstyles = " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />\n"
-HTML.endheader = "</head>\n<body>\n"
-
-HTML.footer = "<div class=\"footer\">Copyright (c) 2011 Digia Plc and/or its subsidiaries. All rights reserved.</div>\n"
diff --git a/doc/style/style.css b/doc/style/style.css
deleted file mode 100644
index df84049..0000000
--- a/doc/style/style.css
+++ /dev/null
@@ -1,137 +0,0 @@
-a:link, a:visited {
- color: #00732F;
- text-decoration: none;
- font-weight: bold;
-}
-
-body {
- font: normal 400 14px/1.2 Arial;
- margin-top: 85px;
-}
-
-h1 {
- margin: 0;
-}
-
-h2 {
- font: 500 20px/1.2 Arial;
-}
-
-h3.fn, span.fn {
- -moz-border-radius: 7px 7px 7px 7px;
- -webkit-border-radius: 7px 7px 7px 7px;
- border-radius: 7px 7px 7px 7px;
- background-color: #F6F6F6;
- border-width: 1px;
- border-style: solid;
- border-color: #E6E6E6;
- word-spacing: 3px;
- padding: 3px 5px;
-}
-
-table, pre {
- -moz-border-radius: 7px 7px 7px 7px;
- -webkit-border-radius: 7px 7px 7px 7px;
- border-radius: 7px 7px 7px 7px;
- background-color: #F6F6F6;
- border: 1px solid #E6E6E6;
- border-collapse: separate;
- font-size: 12px;
- line-height: 1.2;
- margin-bottom: 25px;
- margin-left: 15px;
-}
-
-table td {
- padding: 3px 15px 3px 20px;
-}
-
-table tr.even {
- background-color: white;
- color: #66666E;
-}
-
-table tr.odd {
- background-color: #F6F6F6;
- color: #66666E;
-}
-
-li {
- margin-bottom: 10px;
- padding-left: 12px;
-}
-
-.cpp {
- display: block;
- margin: 10;
- overflow: hidden;
- overflow-x: hidden;
- overflow-y: hidden;
- padding: 20px 0 20px 0;
-}
-
-.footer {
- margin-top: 50px;
-}
-
-.memItemLeft {
- padding-right: 3px;
-}
-
-.memItemRight {
- padding: 3px 15px 3px 0;
-}
-
-.qml {
- display: block;
- margin: 10;
- overflow: hidden;
- overflow-x: hidden;
- overflow-y: hidden;
- padding: 20px 0 20px 0;
-}
-
-.qmldefault {
- padding-left: 5px;
- float: right;
- color: red;
-}
-
-.qmlreadonly {
- padding-left: 5px;
- float: right;
- color: #254117;
-}
-
-.rightAlign {
- padding: 3px 5px 3px 10px;
- text-align: right;
-}
-
-.title {
- background-color: white;
- color: #44A51C;
- font-family: Verdana;
- font-size: 35px;
- font-weight: normal;
- left: 0;
- padding-bottom: 5px;
- padding-left: 16px;
- padding-top: 20px;
- position: absolute;
- right: 0;
- top: 0;
-}
-
-.toc {
- float: right;
- -moz-border-radius: 7px 7px 7px 7px;
- -webkit-border-radius: 7px 7px 7px 7px;
- border-radius: 7px 7px 7px 7px;
- background-color: #F6F6F6;
- border: 1px solid #DDD;
- margin: 0 20px 10px 10px;
- padding: 20px 15px 20px 20px;
- height: auto;
- width: 200px;
-}
diff --git a/doc/src/examples/filetree.qdoc b/examples/xmlpatterns/filetree/doc/src/filetree.qdoc
index d9c2aea..d9c2aea 100644
--- a/doc/src/examples/filetree.qdoc
+++ b/examples/xmlpatterns/filetree/doc/src/filetree.qdoc
diff --git a/doc/src/examples/recipes.qdoc b/examples/xmlpatterns/recipes/doc/src/recipes.qdoc
index c42cfb9..c42cfb9 100644
--- a/doc/src/examples/recipes.qdoc
+++ b/examples/xmlpatterns/recipes/doc/src/recipes.qdoc
diff --git a/doc/src/examples/schema.qdoc b/examples/xmlpatterns/schema/doc/src/schema.qdoc
index 0dc3a91..0dc3a91 100644
--- a/doc/src/examples/schema.qdoc
+++ b/examples/xmlpatterns/schema/doc/src/schema.qdoc
diff --git a/doc/src/examples/trafficinfo.qdoc b/examples/xmlpatterns/trafficinfo/doc/src/trafficinfo.qdoc
index 7a8b7e8..7a8b7e8 100644
--- a/doc/src/examples/trafficinfo.qdoc
+++ b/examples/xmlpatterns/trafficinfo/doc/src/trafficinfo.qdoc
diff --git a/doc/src/examples/globalVariables.qdoc b/examples/xmlpatterns/xquery/doc/src/globalVariables.qdoc
index 08133f6..08133f6 100644
--- a/doc/src/examples/globalVariables.qdoc
+++ b/examples/xmlpatterns/xquery/doc/src/globalVariables.qdoc
diff --git a/doc/src/images/filetree_1-example.png b/src/xmlpatterns/doc/images/filetree_1-example.png
index 7e19174..7e19174 100644
--- a/doc/src/images/filetree_1-example.png
+++ b/src/xmlpatterns/doc/images/filetree_1-example.png
Binary files differ
diff --git a/doc/src/images/filetree_2-example.png b/src/xmlpatterns/doc/images/filetree_2-example.png
index cb794c5..cb794c5 100644
--- a/doc/src/images/filetree_2-example.png
+++ b/src/xmlpatterns/doc/images/filetree_2-example.png
Binary files differ
diff --git a/doc/src/images/patternist-wordProcessor.png b/src/xmlpatterns/doc/images/patternist-wordProcessor.png
index 0901330..0901330 100644
--- a/doc/src/images/patternist-wordProcessor.png
+++ b/src/xmlpatterns/doc/images/patternist-wordProcessor.png
Binary files differ
diff --git a/doc/src/images/recipes-example.png b/src/xmlpatterns/doc/images/recipes-example.png
index 21ebc9b..21ebc9b 100644
--- a/doc/src/images/recipes-example.png
+++ b/src/xmlpatterns/doc/images/recipes-example.png
Binary files differ
diff --git a/doc/src/images/schema-example.png b/src/xmlpatterns/doc/images/schema-example.png
index 5e95bf5..5e95bf5 100644
--- a/doc/src/images/schema-example.png
+++ b/src/xmlpatterns/doc/images/schema-example.png
Binary files differ
diff --git a/doc/src/images/trafficinfo-example.png b/src/xmlpatterns/doc/images/trafficinfo-example.png
index 1717e40..1717e40 100644
--- a/doc/src/images/trafficinfo-example.png
+++ b/src/xmlpatterns/doc/images/trafficinfo-example.png
Binary files differ
diff --git a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf
new file mode 100644
index 0000000..85453f7
--- /dev/null
+++ b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf
@@ -0,0 +1,46 @@
+include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+
+# Name of the project which must match the outputdir. Determines the .index file
+project = qtxmlpatterns
+
+# Directories in which to search for files to document and images.
+# By default set to the root directory of the project for sources
+# and headers and qdoc will therefore generate output for each file.
+# Images should be placed in <rootdir>/dic/images and examples in
+# <rootdir>/examples.
+# Paths are relative to the location of this file.
+exampledirs += ../../../examples \
+ snippets
+
+headerdirs += ..
+imagedirs += images
+sourcedirs += ..
+
+depends += qtcore qtxml qtwidgets
+
+# The following parameters are for creating a qhp file, the qhelpgenerator
+# program can convert the qhp file into a qch file which can be opened in
+# Qt Assistant and/or Qt Creator.
+
+# Defines the name of the project. You cannot use operators (+, =, -) in
+# the name. Properties for this project are set using a qhp.<projectname>.property
+# format.
+qhp.projects = qtxmlpatterns
+
+# Sets the name of the output qhp file.
+qhp.qtxmlpatterns.file = qtxmlpatterns.qhp
+
+# Namespace for the output file. This namespace is used to distinguish between
+# different documentation files in Creator/Assistant.
+qhp.qtxmlpatterns.namespace = org.qt-project.qtxmlpatterns.500
+
+# Title for the package, will be the main title for the package in
+# Assistant/Creator.
+qhp.qtxmlpatterns.indexTitle = Qt XML Patterns Documentation
+
+# Only update the name of the project for the next variables.
+qhp.qtxmlpatterns.virtualFolder = qtxmlpatterns
+qhp.qtxmlpatterns.subprojects = classes
+qhp.qtxmlpatterns.subprojects.classes.title = Qt XML Patterns C++ Classes
+qhp.qtxmlpatterns.subprojects.classes.selectors = class fake:headerfile
+qhp.qtxmlpatterns.subprojects.classes.sortPages = true
diff --git a/doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc b/src/xmlpatterns/doc/snippets/code/doc_src_qtxmlpatterns.qdoc
index ef3702d..ef3702d 100644
--- a/doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc
+++ b/src/xmlpatterns/doc/snippets/code/doc_src_qtxmlpatterns.qdoc
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp
index 8d62064..8d62064 100644
--- a/doc/src/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp
+++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp
index 554ca42..554ca42 100644
--- a/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp
+++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp
index f7b5680..f7b5680 100644
--- a/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp
+++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp
index 906b047..906b047 100644
--- a/doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp
+++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp
index 2b7d470..2b7d470 100644
--- a/doc/src/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp
+++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp
index ba801ba..ba801ba 100644
--- a/doc/src/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp
+++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qxmlname.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlname.cpp
index 9102b6b..9102b6b 100644
--- a/doc/src/snippets/code/src_xmlpatterns_api_qxmlname.cpp
+++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlname.cpp
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlquery.cpp
index e51582d..e51582d 100644
--- a/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp
+++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlquery.cpp
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp
index d17627a..d17627a 100644
--- a/doc/src/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp
+++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp
index 906b047..906b047 100644
--- a/doc/src/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp
+++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp
diff --git a/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp b/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp
new file mode 100644
index 0000000..1159668
--- /dev/null
+++ b/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp
@@ -0,0 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * 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.
+** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+** of its contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** 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."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+//! [0]
+#include <QtXmlPatterns>
+//! [0]
diff --git a/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.pro b/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.pro
new file mode 100644
index 0000000..12afbd8
--- /dev/null
+++ b/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.pro
@@ -0,0 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * 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.
+** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+** of its contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** 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."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#! [1]
+QT += xmlpatterns
+#! [1]
diff --git a/doc/src/snippets/patternist/anyHTMLElement.xq b/src/xmlpatterns/doc/snippets/patternist/anyHTMLElement.xq
index 9f5ee12..9f5ee12 100644
--- a/doc/src/snippets/patternist/anyHTMLElement.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/anyHTMLElement.xq
diff --git a/doc/src/snippets/patternist/anyXLinkAttribute.xq b/src/xmlpatterns/doc/snippets/patternist/anyXLinkAttribute.xq
index 059bcc0..059bcc0 100644
--- a/doc/src/snippets/patternist/anyXLinkAttribute.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/anyXLinkAttribute.xq
diff --git a/doc/src/snippets/patternist/bracesIncluded.xq b/src/xmlpatterns/doc/snippets/patternist/bracesIncluded.xq
index 3961c28..3961c28 100644
--- a/doc/src/snippets/patternist/bracesIncluded.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/bracesIncluded.xq
diff --git a/doc/src/snippets/patternist/bracesIncludedResult.xml b/src/xmlpatterns/doc/snippets/patternist/bracesIncludedResult.xml
index 0004c71..0004c71 100644
--- a/doc/src/snippets/patternist/bracesIncludedResult.xml
+++ b/src/xmlpatterns/doc/snippets/patternist/bracesIncludedResult.xml
diff --git a/doc/src/snippets/patternist/bracesOmitted.xq b/src/xmlpatterns/doc/snippets/patternist/bracesOmitted.xq
index ffbadd0..ffbadd0 100644
--- a/doc/src/snippets/patternist/bracesOmitted.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/bracesOmitted.xq
diff --git a/doc/src/snippets/patternist/bracesOmittedResult.xml b/src/xmlpatterns/doc/snippets/patternist/bracesOmittedResult.xml
index 744fb8f..744fb8f 100644
--- a/doc/src/snippets/patternist/bracesOmittedResult.xml
+++ b/src/xmlpatterns/doc/snippets/patternist/bracesOmittedResult.xml
diff --git a/doc/src/snippets/patternist/computedTreeFragment.xq b/src/xmlpatterns/doc/snippets/patternist/computedTreeFragment.xq
index c5b93ad..c5b93ad 100644
--- a/doc/src/snippets/patternist/computedTreeFragment.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/computedTreeFragment.xq
diff --git a/doc/src/snippets/patternist/copyAttribute.xq b/src/xmlpatterns/doc/snippets/patternist/copyAttribute.xq
index 40e4494..40e4494 100644
--- a/doc/src/snippets/patternist/copyAttribute.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/copyAttribute.xq
diff --git a/doc/src/snippets/patternist/copyID.xq b/src/xmlpatterns/doc/snippets/patternist/copyID.xq
index 2409caf..2409caf 100644
--- a/doc/src/snippets/patternist/copyID.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/copyID.xq
diff --git a/doc/src/snippets/patternist/directTreeFragment.xq b/src/xmlpatterns/doc/snippets/patternist/directTreeFragment.xq
index 96bc963..96bc963 100644
--- a/doc/src/snippets/patternist/directTreeFragment.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/directTreeFragment.xq
diff --git a/doc/src/snippets/patternist/doc.txt b/src/xmlpatterns/doc/snippets/patternist/doc.txt
index d30b057..d30b057 100644
--- a/doc/src/snippets/patternist/doc.txt
+++ b/src/xmlpatterns/doc/snippets/patternist/doc.txt
diff --git a/doc/src/snippets/patternist/docPlainHTML.xq b/src/xmlpatterns/doc/snippets/patternist/docPlainHTML.xq
index 622bec8..622bec8 100644
--- a/doc/src/snippets/patternist/docPlainHTML.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/docPlainHTML.xq
diff --git a/doc/src/snippets/patternist/docPlainHTML2.xq b/src/xmlpatterns/doc/snippets/patternist/docPlainHTML2.xq
index 5e7fbae..5e7fbae 100644
--- a/doc/src/snippets/patternist/docPlainHTML2.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/docPlainHTML2.xq
diff --git a/doc/src/snippets/patternist/embedDataInXHTML.xq b/src/xmlpatterns/doc/snippets/patternist/embedDataInXHTML.xq
index b513922..b513922 100644
--- a/doc/src/snippets/patternist/embedDataInXHTML.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/embedDataInXHTML.xq
diff --git a/doc/src/snippets/patternist/embedDataInXHTML2.xq b/src/xmlpatterns/doc/snippets/patternist/embedDataInXHTML2.xq
index 754ddba..754ddba 100644
--- a/doc/src/snippets/patternist/embedDataInXHTML2.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/embedDataInXHTML2.xq
diff --git a/doc/src/snippets/patternist/emptyParagraphs.xq b/src/xmlpatterns/doc/snippets/patternist/emptyParagraphs.xq
index 6024d28..6024d28 100644
--- a/doc/src/snippets/patternist/emptyParagraphs.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/emptyParagraphs.xq
diff --git a/doc/src/snippets/patternist/escapeCurlyBraces.xq b/src/xmlpatterns/doc/snippets/patternist/escapeCurlyBraces.xq
index 669e7c1..669e7c1 100644
--- a/doc/src/snippets/patternist/escapeCurlyBraces.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/escapeCurlyBraces.xq
diff --git a/doc/src/snippets/patternist/escapeStringLiterals.xml b/src/xmlpatterns/doc/snippets/patternist/escapeStringLiterals.xml
index 425ccb0..425ccb0 100644
--- a/doc/src/snippets/patternist/escapeStringLiterals.xml
+++ b/src/xmlpatterns/doc/snippets/patternist/escapeStringLiterals.xml
diff --git a/doc/src/snippets/patternist/escapeStringLiterals.xq b/src/xmlpatterns/doc/snippets/patternist/escapeStringLiterals.xq
index 4a6054b..4a6054b 100644
--- a/doc/src/snippets/patternist/escapeStringLiterals.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/escapeStringLiterals.xq
diff --git a/doc/src/snippets/patternist/expressionInsideAttribute.xq b/src/xmlpatterns/doc/snippets/patternist/expressionInsideAttribute.xq
index 97f46b1..97f46b1 100644
--- a/doc/src/snippets/patternist/expressionInsideAttribute.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/expressionInsideAttribute.xq
diff --git a/doc/src/snippets/patternist/filterOnPath.xq b/src/xmlpatterns/doc/snippets/patternist/filterOnPath.xq
index d23dfe8..d23dfe8 100644
--- a/doc/src/snippets/patternist/filterOnPath.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/filterOnPath.xq
diff --git a/doc/src/snippets/patternist/filterOnStep.xq b/src/xmlpatterns/doc/snippets/patternist/filterOnStep.xq
index 46b77fa..46b77fa 100644
--- a/doc/src/snippets/patternist/filterOnStep.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/filterOnStep.xq
diff --git a/doc/src/snippets/patternist/firstParagraph.xq b/src/xmlpatterns/doc/snippets/patternist/firstParagraph.xq
index db5e2c7..db5e2c7 100644
--- a/doc/src/snippets/patternist/firstParagraph.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/firstParagraph.xq
diff --git a/doc/src/snippets/patternist/fnStringOnAttribute.xq b/src/xmlpatterns/doc/snippets/patternist/fnStringOnAttribute.xq
index b26e9f2..b26e9f2 100644
--- a/doc/src/snippets/patternist/fnStringOnAttribute.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/fnStringOnAttribute.xq
diff --git a/doc/src/snippets/patternist/forClause.xq b/src/xmlpatterns/doc/snippets/patternist/forClause.xq
index a412dca..a412dca 100644
--- a/doc/src/snippets/patternist/forClause.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/forClause.xq
diff --git a/doc/src/snippets/patternist/forClause2.xq b/src/xmlpatterns/doc/snippets/patternist/forClause2.xq
index 4fa505d..4fa505d 100644
--- a/doc/src/snippets/patternist/forClause2.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/forClause2.xq
diff --git a/doc/src/snippets/patternist/forClauseOnFeed.xq b/src/xmlpatterns/doc/snippets/patternist/forClauseOnFeed.xq
index 9ec3339..9ec3339 100644
--- a/doc/src/snippets/patternist/forClauseOnFeed.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/forClauseOnFeed.xq
diff --git a/doc/src/snippets/patternist/indented.xml b/src/xmlpatterns/doc/snippets/patternist/indented.xml
index a312c63..a312c63 100644
--- a/doc/src/snippets/patternist/indented.xml
+++ b/src/xmlpatterns/doc/snippets/patternist/indented.xml
diff --git a/doc/src/snippets/patternist/introAcneRemover.xq b/src/xmlpatterns/doc/snippets/patternist/introAcneRemover.xq
index 4e6ee80..4e6ee80 100644
--- a/doc/src/snippets/patternist/introAcneRemover.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/introAcneRemover.xq
diff --git a/doc/src/snippets/patternist/introExample2.xq b/src/xmlpatterns/doc/snippets/patternist/introExample2.xq
index 411cc17..411cc17 100644
--- a/doc/src/snippets/patternist/introExample2.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/introExample2.xq
diff --git a/doc/src/snippets/patternist/introFileHierarchy.xml b/src/xmlpatterns/doc/snippets/patternist/introFileHierarchy.xml
index cfa6151..cfa6151 100644
--- a/doc/src/snippets/patternist/introFileHierarchy.xml
+++ b/src/xmlpatterns/doc/snippets/patternist/introFileHierarchy.xml
diff --git a/doc/src/snippets/patternist/introNavigateFS.xq b/src/xmlpatterns/doc/snippets/patternist/introNavigateFS.xq
index 1f5a3a7..1f5a3a7 100644
--- a/doc/src/snippets/patternist/introNavigateFS.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/introNavigateFS.xq
diff --git a/doc/src/snippets/patternist/introductionExample.xq b/src/xmlpatterns/doc/snippets/patternist/introductionExample.xq
index 1a309dd..1a309dd 100644
--- a/doc/src/snippets/patternist/introductionExample.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/introductionExample.xq
diff --git a/doc/src/snippets/patternist/invalidLetOrderBy.xq b/src/xmlpatterns/doc/snippets/patternist/invalidLetOrderBy.xq
index d65f240..d65f240 100644
--- a/doc/src/snippets/patternist/invalidLetOrderBy.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/invalidLetOrderBy.xq
diff --git a/doc/src/snippets/patternist/items.xq b/src/xmlpatterns/doc/snippets/patternist/items.xq
index 0b46ec1..0b46ec1 100644
--- a/doc/src/snippets/patternist/items.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/items.xq
diff --git a/doc/src/snippets/patternist/letOrderBy.xq b/src/xmlpatterns/doc/snippets/patternist/letOrderBy.xq
index f4106d2..f4106d2 100644
--- a/doc/src/snippets/patternist/letOrderBy.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/letOrderBy.xq
diff --git a/doc/src/snippets/patternist/literalsAndOperators.xq b/src/xmlpatterns/doc/snippets/patternist/literalsAndOperators.xq
index ec4af33..ec4af33 100644
--- a/doc/src/snippets/patternist/literalsAndOperators.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/literalsAndOperators.xq
diff --git a/doc/src/snippets/patternist/mobeyDick.xml b/src/xmlpatterns/doc/snippets/patternist/mobeyDick.xml
index 32d0b6c..32d0b6c 100644
--- a/doc/src/snippets/patternist/mobeyDick.xml
+++ b/src/xmlpatterns/doc/snippets/patternist/mobeyDick.xml
diff --git a/doc/src/snippets/patternist/nextLastParagraph.xq b/src/xmlpatterns/doc/snippets/patternist/nextLastParagraph.xq
index 9424f79..9424f79 100644
--- a/doc/src/snippets/patternist/nextLastParagraph.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/nextLastParagraph.xq
diff --git a/doc/src/snippets/patternist/nodeConstructorsAreExpressions.xq b/src/xmlpatterns/doc/snippets/patternist/nodeConstructorsAreExpressions.xq
index ce36e84..ce36e84 100644
--- a/doc/src/snippets/patternist/nodeConstructorsAreExpressions.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/nodeConstructorsAreExpressions.xq
diff --git a/doc/src/snippets/patternist/nodeConstructorsInPaths.xq b/src/xmlpatterns/doc/snippets/patternist/nodeConstructorsInPaths.xq
index beb294f..beb294f 100644
--- a/doc/src/snippets/patternist/nodeConstructorsInPaths.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/nodeConstructorsInPaths.xq
diff --git a/doc/src/snippets/patternist/nodeTestChildElement.xq b/src/xmlpatterns/doc/snippets/patternist/nodeTestChildElement.xq
index 7aa7b34..7aa7b34 100644
--- a/doc/src/snippets/patternist/nodeTestChildElement.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/nodeTestChildElement.xq
diff --git a/doc/src/snippets/patternist/notIndented.xml b/src/xmlpatterns/doc/snippets/patternist/notIndented.xml
index b3321f2..b3321f2 100644
--- a/doc/src/snippets/patternist/notIndented.xml
+++ b/src/xmlpatterns/doc/snippets/patternist/notIndented.xml
diff --git a/doc/src/snippets/patternist/oneElementConstructor.xq b/src/xmlpatterns/doc/snippets/patternist/oneElementConstructor.xq
index b7eb615..b7eb615 100644
--- a/doc/src/snippets/patternist/oneElementConstructor.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/oneElementConstructor.xq
diff --git a/doc/src/snippets/patternist/paragraphsExceptTheFiveFirst.xq b/src/xmlpatterns/doc/snippets/patternist/paragraphsExceptTheFiveFirst.xq
index 16438d1..16438d1 100644
--- a/doc/src/snippets/patternist/paragraphsExceptTheFiveFirst.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/paragraphsExceptTheFiveFirst.xq
diff --git a/doc/src/snippets/patternist/paragraphsWithTables.xq b/src/xmlpatterns/doc/snippets/patternist/paragraphsWithTables.xq
index dbb9fcf..dbb9fcf 100644
--- a/doc/src/snippets/patternist/paragraphsWithTables.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/paragraphsWithTables.xq
diff --git a/doc/src/snippets/patternist/pathAB.xq b/src/xmlpatterns/doc/snippets/patternist/pathAB.xq
index 26fd1e5..26fd1e5 100644
--- a/doc/src/snippets/patternist/pathAB.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/pathAB.xq
diff --git a/doc/src/snippets/patternist/pathsAllParagraphs.xq b/src/xmlpatterns/doc/snippets/patternist/pathsAllParagraphs.xq
index ba47900..ba47900 100644
--- a/doc/src/snippets/patternist/pathsAllParagraphs.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/pathsAllParagraphs.xq
diff --git a/doc/src/snippets/patternist/simpleHTML.xq b/src/xmlpatterns/doc/snippets/patternist/simpleHTML.xq
index 93ac31e..93ac31e 100644
--- a/doc/src/snippets/patternist/simpleHTML.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/simpleHTML.xq
diff --git a/doc/src/snippets/patternist/simpleXHTML.xq b/src/xmlpatterns/doc/snippets/patternist/simpleXHTML.xq
index fda5371..fda5371 100644
--- a/doc/src/snippets/patternist/simpleXHTML.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/simpleXHTML.xq
diff --git a/doc/src/snippets/patternist/svgDocumentElement.xml b/src/xmlpatterns/doc/snippets/patternist/svgDocumentElement.xml
index 0c7be4e..0c7be4e 100644
--- a/doc/src/snippets/patternist/svgDocumentElement.xml
+++ b/src/xmlpatterns/doc/snippets/patternist/svgDocumentElement.xml
diff --git a/doc/src/snippets/patternist/tablesInParagraphs.xq b/src/xmlpatterns/doc/snippets/patternist/tablesInParagraphs.xq
index fc92cf0..fc92cf0 100644
--- a/doc/src/snippets/patternist/tablesInParagraphs.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/tablesInParagraphs.xq
diff --git a/doc/src/snippets/patternist/twoSVGElements.xq b/src/xmlpatterns/doc/snippets/patternist/twoSVGElements.xq
index ab4fe35..ab4fe35 100644
--- a/doc/src/snippets/patternist/twoSVGElements.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/twoSVGElements.xq
diff --git a/doc/src/snippets/patternist/xmlStylesheet.xq b/src/xmlpatterns/doc/snippets/patternist/xmlStylesheet.xq
index 9e02208..9e02208 100644
--- a/doc/src/snippets/patternist/xmlStylesheet.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/xmlStylesheet.xq
diff --git a/doc/src/snippets/patternist/xsBooleanTrue.xq b/src/xmlpatterns/doc/snippets/patternist/xsBooleanTrue.xq
index 897a99e..897a99e 100644
--- a/doc/src/snippets/patternist/xsBooleanTrue.xq
+++ b/src/xmlpatterns/doc/snippets/patternist/xsBooleanTrue.xq
diff --git a/doc/src/snippets/patternist/xsvgDocumentElement.xml b/src/xmlpatterns/doc/snippets/patternist/xsvgDocumentElement.xml
index fb6a236..fb6a236 100644
--- a/doc/src/snippets/patternist/xsvgDocumentElement.xml
+++ b/src/xmlpatterns/doc/snippets/patternist/xsvgDocumentElement.xml
diff --git a/doc/src/snippets/qxmlquery/bindingExample.cpp b/src/xmlpatterns/doc/snippets/qxmlquery/bindingExample.cpp
index 353f3a1..353f3a1 100644
--- a/doc/src/snippets/qxmlquery/bindingExample.cpp
+++ b/src/xmlpatterns/doc/snippets/qxmlquery/bindingExample.cpp
diff --git a/doc/src/snippets/qxmlschema/main.cpp b/src/xmlpatterns/doc/snippets/qxmlschema/main.cpp
index 718530e..718530e 100644
--- a/doc/src/snippets/qxmlschema/main.cpp
+++ b/src/xmlpatterns/doc/snippets/qxmlschema/main.cpp
diff --git a/doc/src/snippets/qxmlschemavalidator/main.cpp b/src/xmlpatterns/doc/snippets/qxmlschemavalidator/main.cpp
index 1992a52..1992a52 100644
--- a/doc/src/snippets/qxmlschemavalidator/main.cpp
+++ b/src/xmlpatterns/doc/snippets/qxmlschemavalidator/main.cpp
diff --git a/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc b/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc
new file mode 100644
index 0000000..afc3b38
--- /dev/null
+++ b/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc
@@ -0,0 +1,112 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+/*!
+ \page qtxmlpatterns-index.html
+ \title Qt XML Patterns
+ \brief The Qt XML Patterns module provides support for XPath,
+ XQuery, XSLT and XML Schema validation.
+
+ The Qt XML Patterns module provides support for XPath,
+ XQuery, XSLT, and XML Schema validation.
+
+ \section1 Getting Started
+
+ To include the definitions of the module's classes, use the
+ following directive:
+
+ \snippet doc_src_qtxmlpatterns.cpp 0
+
+ To link against the module, add this line to your \l qmake \c
+ .pro file:
+
+ \snippet doc_src_qtxmlpatterns.pro 1
+
+ \section1 Articles and Guides
+
+ \list
+ \li \l{A Short Path to XQuery} - an introduction to the XQuery language.
+ \li \l{XQuery} - general overviews of XQuery and XSchema
+ \endlist
+
+ \section1 API Reference
+
+ These are links to the API reference materials.
+ \list
+ \li \l{Qt XML Patterns C++ Classes}{C++ Classes}
+ \endlist
+
+ \section1 License Information
+
+ The XML Schema implementation provided by this module contains the \c xml.xsd file
+ (located in \c{src/xmlpatterns/schema/schemas}) which is licensed under the terms
+ given below. This module is always built with XML Schema support enabled.
+
+ \legalese
+ W3C\copyright SOFTWARE NOTICE AND LICENSE
+
+ This license came from: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+ This work (and included software, documentation such as READMEs, or other
+ related items) is being provided by the copyright holders under the following
+ license. By obtaining, using and/or copying this work, you (the licensee)
+ agree that you have read, understood, and will comply with the following
+ terms and conditions.
+
+ Permission to copy, modify, and distribute this software and its
+ documentation, with or without modification, for any purpose and without
+ fee or royalty is hereby granted, provided that you include the following on
+ ALL copies of the software and documentation or portions thereof, including
+ modifications:
+
+ 1. The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.\br
+ 2. Any pre-existing intellectual property disclaimers, notices, or terms
+ and conditions. If none exist, the W3C Software Short Notice should be
+ included (hypertext is preferred, text is permitted)
+ within the body of any redistributed or derivative code.\br
+ 3. Notice of any changes or modifications to the files, including the date
+ changes were made. (We recommend you provide URIs to the location from
+ which the code is derived.)
+
+ THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
+ MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+ PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
+ ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+ COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+ CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+ DOCUMENTATION.
+
+ The name and trademarks of copyright holders may NOT be used in
+ advertising or publicity pertaining to the software without specific, written
+ prior permission. Title to copyright in this software and any associated
+ documentation will at all times remain with copyright holders.
+ \endlegalese
+
+
+*/
diff --git a/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc b/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc
new file mode 100644
index 0000000..c88b28a
--- /dev/null
+++ b/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+/*!
+ \module QtXmlPatterns
+ \title Qt XML Patterns C++ Classes
+ \brief The Qt XML Patterns module provides support for XPath,
+ XQuery, XSLT and XML Schema validation.
+
+ \ingroup modules
+ \ingroup technology-apis
+
+The \l{Qt XML Patterns} module provides support for XPath,
+ XQuery, XSLT and XML Schema validation.
+
+ To include the definitions of the module's classes, use the
+ following directive:
+
+ \snippet doc_src_qtxmlpatterns.cpp 0
+
+ To link against the module, add this line to your \l qmake \c
+ .pro file:
+
+ \snippet doc_src_qtxmlpatterns.pro 1
+*/
diff --git a/doc/src/xml-processing/xml-patterns.qdoc b/src/xmlpatterns/doc/src/xml-patterns.qdoc
index 1aab9b7..3920be5 100644
--- a/doc/src/xml-processing/xml-patterns.qdoc
+++ b/src/xmlpatterns/doc/src/xml-patterns.qdoc
@@ -28,7 +28,7 @@
/*!
\page xmlprocessing.html
\title XQuery
-
+
\previouspage Working with the DOM Tree
\contentspage XML Processing
diff --git a/doc/src/xml-processing/xquery-introduction.qdoc b/src/xmlpatterns/doc/src/xquery-introduction.qdoc
index c0787d7..c0787d7 100644
--- a/doc/src/xml-processing/xquery-introduction.qdoc
+++ b/src/xmlpatterns/doc/src/xquery-introduction.qdoc
diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro
index 1923cce..49543b6 100644
--- a/src/xmlpatterns/xmlpatterns.pro
+++ b/src/xmlpatterns/xmlpatterns.pro
@@ -5,7 +5,7 @@ QT = core-private network
DEFINES += QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
-QMAKE_DOCS = $$PWD/../../doc/qt5.qdocconf
+QMAKE_DOCS = $$PWD/doc/qtxmlpatterns.qdocconf
load(qt_module)
diff --git a/tests/auto/patternistexamples/tst_patternistexamples.cpp b/tests/auto/patternistexamples/tst_patternistexamples.cpp
index f3ef905..b34622a 100644
--- a/tests/auto/patternistexamples/tst_patternistexamples.cpp
+++ b/tests/auto/patternistexamples/tst_patternistexamples.cpp
@@ -82,7 +82,7 @@ private:
void tst_PatternistExamples::initTestCase()
{
#ifndef Q_OS_WINCE
- m_dirs.append(QDir(QLatin1String(SOURCETREE "doc/src/snippets/patternist/")));
+ m_dirs.append(QDir(QLatin1String(SOURCETREE "src/xmlpatterns/doc/snippets/patternist/")));
m_dirs.append(QDir(QLatin1String(SOURCETREE "examples/xmlpatterns/xquery/globalVariables/")));
m_dirs.append(QDir(QLatin1String(SOURCETREE "examples/xmlpatterns/filetree/")));
m_dirs.append(QDir(QLatin1String(SOURCETREE "examples/xmlpatterns/recipes/")));
@@ -219,7 +219,7 @@ static QUrl abstractURI()
{
QUrl baseURI;
QUrl relative;
-#include "../../../doc/src/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp"
+#include "../../../src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp"
}
class MyValue
@@ -296,7 +296,7 @@ MyTreeModel::MyTreeModel(const QXmlNamePool &np, const QFile &) : QSimpleXmlNode
{
}
-#include "../../../doc/src/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp"
+#include "../../../src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp"
class MyMapper
{
@@ -305,10 +305,10 @@ public:
enum OutputType
{
};
-#include "../../../doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp"
+#include "../../../src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp"
};
-#include "../../../doc/src/snippets/code/src_xmlpatterns_api_qxmlname.cpp"
+#include "../../../src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlname.cpp"
void tst_PatternistExamples::buildSnippets() const
{
@@ -322,7 +322,7 @@ void tst_PatternistExamples::buildSnippets() const
}
{
-#include "../../../doc/src/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp"
+#include "../../../src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp"
}
{
@@ -330,19 +330,19 @@ void tst_PatternistExamples::buildSnippets() const
{
QIODevice *myOutputDevice = 0;
-#include "../../../doc/src/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp"
+#include "../../../src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp"
}
{
QIODevice *myOutputDevice = 0;
-#include "../../../doc/src/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp"
+#include "../../../src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp"
}
{
QXmlNodeModelIndex myInstance;
const char **argv = 0;
typedef MyTreeModel ChemistryNodeModel;
-#include "../../../doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp"
+#include "../../../src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp"
}
{
@@ -350,14 +350,14 @@ void tst_PatternistExamples::buildSnippets() const
{
QIODevice *myOutputDevice = 0;
-#include "../../../doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp"
+#include "../../../src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp"
}
{
QXmlQuery query;
QString localName;
QVariant value;
-#include "../../../doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp"
+#include "../../../src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlquery.cpp"
}
}