Fix bug#168 - "API documentation suggestions" and other fixes.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Marcelo Lira <marcelo.lira@openbossa.org>

4 files changed, 479 insertions, 95 deletions

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 92389b974..7b29ca69e 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,91 +1,54 @@
-find_program(graphviz_exec dot)
+project(doc)
 
-if (QT_SRC_DIR)
+set(DOC_DATA_DIR "${CMAKE_CURRENT_BINARY_DIR}/qdoc3-output")
+configure_file("pyside.qdocconf.in" "pyside.qdocconf" @ONLY)
 
-if (NOT ${graphviz_exec} STREQUAL graphviz_exec-NOTFOUND)
+add_custom_target(qdoc3
+                COMMAND qdoc3 pyside.qdocconf
+                COMMENT "Running qdoc3 against Qt source code..."
+                SOURCE "pyside.qdocconf")
 
 add_custom_target(apidoc
                   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/rst
-                  COMMAND sphinx-build -b html  ${CMAKE_CURRENT_BINARY_DIR}/rst htmldocs
+                  COMMAND sphinx-build -b html  ${CMAKE_CURRENT_BINARY_DIR}/rst html
                  )
 
 # create conf.py based on conf.py.in
 configure_file("conf.py.in" "rst/conf.py" @ONLY)
-
-# copy pyside.qdocconf to qt source dir.
-configure_file("pyside.qdocconf" "${QT_SRC_DIR}/tools/qdoc3/test/pyside.qdocconf" @ONLY)
-set(DOC_DATA_DIR "${CMAKE_CURRENT_BINARY_DIR}/qt4xmldoc")
-set(ENV{QTDIR} ${QT_SRC_DIR} )
-
-add_custom_target(qdoc3
-                  COMMAND QTDIR=${QT_SRC_DIR} qdoc3 pyside.qdocconf
-                  WORKING_DIRECTORY "${QT_SRC_DIR}/tools/qdoc3/test"
-                  COMMENT "Running qdoc3 against Qt source code..."
-                  SOURCE "pyside.qdocconf")
-
-macro(create_doc module typesystem_path)
-string(REGEX REPLACE "^Qt" "" module_name ${module})
-string(TOLOWER ${module_name} module_name)
-add_custom_target("${module}-apidoc"
-COMMAND ${GENERATORRUNNER_BINARY} --generatorSet=qtdoc
-        ${pyside_BINARY_DIR}/global.h
-        --include-paths=${QT_INCLUDE_DIR}:${QT_QTCORE_INCLUDE_DIR}
-        --typesystem-paths=${pyside_SOURCE_DIR}:${${module}_BINARY_DIR}:${typesystem_path}
-        ${pyside_SOURCE_DIR}/${module}/typesystem_${module_name}.xml
-        --library-source-dir=${QT_SRC_DIR}
-        --documentation-only
-        --documentation-data-dir=${DOC_DATA_DIR}
-        --documentation-out-dir=${CMAKE_CURRENT_BINARY_DIR}/rst
-        --documentation-code-snippets-dir=${CMAKE_CURRENT_SOURCE_DIR}/codesnippets
-WORKING_DIRECTORY ${${module}_SOURCE_DIR}
-
-COMMENT "Running generator to generate documentation of ${module}..."
-)
-add_dependencies("${module}-apidoc" qdoc3)
-add_dependencies(apidoc "${module}-apidoc")
-endmacro()
-
-create_doc(QtCore "")
-create_doc(QtGui "${QtCore_SOURCE_DIR}")
-create_doc(QtHelp "${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtHelp_SOURCE_DIR}")
-create_doc(QtNetwork "${QtCore_SOURCE_DIR}")
-create_doc(QtOpengl "${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtOpenGL_SOURCE_DIR}")
-create_doc(QtSql "${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtSql_SOURCE_DIR}")
-create_doc(QtSvg "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-create_doc(QtUitools "${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtXml_SOURCE_DIR}:${QtUiTools_SOURCE_DIR}")
-create_doc(QtXml "${QtCore_SOURCE_DIR}")
-create_doc(QtWebKit "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtNetwork_SOURCE_DIR}")
-create_doc(QtMultimedia "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-create_doc(QtScript "${QtCore_SOURCE_DIR}")
-create_doc(QtScriptTools "${QtCore_SOURCE_DIR}:${QtScript_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-create_doc(QtTest "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-create_doc(QtXmlPatterns "${QtCore_SOURCE_DIR}")
-create_doc(phonon "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-if (QT_QTDECLARATIVE_FOUND)
-    create_doc(QtDeclarative "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtNetwork_SOURCE_DIR}")
-endif()
-
-#create devhelp file
-add_custom_target(apidevhelp
-    COMMAND python;${CMAKE_CURRENT_SOURCE_DIR}/pyhtml2devhelp.py;${CMAKE_BINARY_DIR}/apidoc/html;index.html >
-            ${CMAKE_BINARY_DIR}/apidoc/html/PySide.devhelp;${BINDING_API_VERSION}&&;
-            gzip;-9v;-f;${CMAKE_BINARY_DIR}/apidoc/html/PySide.devhelp
-    COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_INSTALL_PREFIX}/share/devhelp/books"
-    COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_INSTALL_PREFIX}/share/doc/${BINDING_NAME}/html" "${CMAKE_INSTALL_PREFIX}/share/devhelp/books/${BINDING_NAME}"
+configure_file(typesystem_doc.xml.in typesystem_doc.xml @ONLY)
+
+add_custom_target("docrsts"
+    COMMAND ${GENERATORRUNNER_BINARY} --generatorSet=qtdoc
+            ${pyside_BINARY_DIR}/global.h
+            --include-paths="${QT_INCLUDE_DIR}${PATH_SEP}${QT_QTCORE_INCLUDE_DIR}"
+            --api-version=${SUPPORTED_QT_VERSION}
+            --typesystem-paths="${pyside_SOURCE_DIR}${PATH_SEP}${QtCore_SOURCE_DIR}${PATH_SEP}${QtDeclarative_SOURCE_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}${PATH_SEP}${QtHelp_SOURCE_DIR}${PATH_SEP}${QtMaemo5_SOURCE_DIR}${PATH_SEP}${QtMultimedia_SOURCE_DIR}${PATH_SEP}${QtNetwork_SOURCE_DIR}${PATH_SEP}${QtOpenGL_SOURCE_DIR}${PATH_SEP}${QtScript_SOURCE_DIR}${PATH_SEP}${QtScriptTools_SOURCE_DIR}${PATH_SEP}${QtSql_SOURCE_DIR}${PATH_SEP}${QtSvg_SOURCE_DIR}${PATH_SEP}${QtTest_SOURCE_DIR}${PATH_SEP}${QtUiTools_SOURCE_DIR}${PATH_SEP}${QtWebKit_SOURCE_DIR}${PATH_SEP}${QtXml_SOURCE_DIR}${PATH_SEP}${QtXmlPatterns_SOURCE_DIR}"
+            --library-source-dir=${QT_SRC_DIR}
+            --documentation-only
+            --documentation-data-dir=${DOC_DATA_DIR}
+            --output-directory=${CMAKE_CURRENT_BINARY_DIR}/rst
+            --documentation-code-snippets-dir=${CMAKE_CURRENT_SOURCE_DIR}/codesnippets
+            ${CMAKE_CURRENT_BINARY_DIR}/typesystem_doc.xml
+    WORKING_DIRECTORY ${${module}_SOURCE_DIR}
+    COMMENT "Running generator to generate documentation..."
 )
+add_dependencies(apidoc docrsts)
+add_dependencies(docrsts qdoc3)
+
+# #create devhelp file
+# add_custom_target(apidevhelp
+#     COMMAND python;${CMAKE_CURRENT_SOURCE_DIR}/pyhtml2devhelp.py;${CMAKE_BINARY_DIR}/apidoc/html;index.html >
+#             ${CMAKE_BINARY_DIR}/apidoc/html/PySide.devhelp;${BINDING_API_VERSION}&&;
+#             gzip;-9v;-f;${CMAKE_BINARY_DIR}/apidoc/html/PySide.devhelp
+#     COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_INSTALL_PREFIX}/share/devhelp/books"
+#     COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_INSTALL_PREFIX}/share/doc/${BINDING_NAME}/html" "${CMAKE_INSTALL_PREFIX}/share/devhelp/books/${BINDING_NAME}"
+# )
 
 #install files
 add_custom_target(apidocinstall
-    COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/share/doc/${BINDING_NAME} && cp -rv ${CMAKE_BINARY_DIR}/apidoc/* ${CMAKE_INSTALL_PREFIX}/share/doc/${BINDING_NAME}
+    COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/share/doc/PySide-${BINDING_API_VERSION} && cp -rv ${CMAKE_CURRENT_BINARY_DIR}/html/* ${CMAKE_INSTALL_PREFIX}/share/doc/PySide-${BINDING_API_VERSION}
 )
 
-add_dependencies(apidocinstall apidevhelp)
-
-else ()
-    message(STATUS "Missing graphviz tool (dot), apidoc generation targets disabled.")
-endif ()
-
-else ()
-    message(STATUS "QT_SRC_DIR variable not set, apidoc generation targets disabled.")
-endif ()
+add_dependencies(apidocinstall apidoc)
+# add_dependencies(apidocinstall apidevhelp)
 
diff --git a/doc/pyside.qdocconf b/doc/pyside.qdocconf
deleted file mode 100644
index 1e940fa43..000000000
--- a/doc/pyside.qdocconf
+++ /dev/null
@@ -1,20 +0,0 @@
-include(qt.qdocconf)
-
-quotinginformation      = true
-exampledirs             = $QTDIR/doc/src \
-                          $QTDIR/examples \
-                          $QTDIR/examples/tutorials \
-                          $QTDIR \
-                          $QTDIR/qmake/examples \
-                          $QTDIR/src/3rdparty/webkit/WebKit/qt/docs
-
-imagedirs               = $QTDIR/doc/src/images \
-                          $QTDIR/examples \
-                          $QTDIR/doc/src/declarative/pics \
-                          $QTDIR/doc/src/template/image
-
-outputdir               = @CMAKE_CURRENT_BINARY_DIR@/qt4xmldoc
-outputformats           = WebXML
-
-generateindex           = false
-url                     = .
diff --git a/doc/pyside.qdocconf.in b/doc/pyside.qdocconf.in
new file mode 100644
index 000000000..a9b02238b
--- /dev/null
+++ b/doc/pyside.qdocconf.in
@@ -0,0 +1,352 @@
+######################## compat.qdocconf
+alias.i                         = e
+alias.include                   = input
+
+macro.0                         = "\\\\0"
+macro.b                         = "\\\\b"
+macro.n                         = "\\\\n"
+macro.r                         = "\\\\r"
+macro.i                         = "\\o"
+macro.i11                       = "\\o{1,1}"
+macro.i12                       = "\\o{1,2}"
+macro.i13                       = "\\o{1,3}"
+macro.i14                       = "\\o{1,4}"
+macro.i15                       = "\\o{1,5}"
+macro.i16                       = "\\o{1,6}"
+macro.i17                       = "\\o{1,7}"
+macro.i18                       = "\\o{1,8}"
+macro.i19                       = "\\o{1,9}"
+macro.i21                       = "\\o{2,1}"
+macro.i31                       = "\\o{3,1}"
+macro.i41                       = "\\o{4,1}"
+macro.i51                       = "\\o{5,1}"
+macro.i61                       = "\\o{6,1}"
+macro.i71                       = "\\o{7,1}"
+macro.i81                       = "\\o{8,1}"
+macro.i91                       = "\\o{9,1}"
+macro.img                       = "\\image"
+macro.endquote                  = "\\endquotation"
+macro.relatesto                 = "\\relates"
+
+spurious                        = "Missing comma in .*" \
+                                  "Missing pattern .*"
+
+######################## macros.qdocconf
+macro.aacute.HTML       = "á"
+macro.Aring.HTML        = "Å"
+macro.aring.HTML        = "å"
+macro.Auml.HTML         = "Ä"
+macro.author            = "\\bold{Author:}"
+macro.br.HTML           = "<br />"
+macro.BR.HTML           = "<br />"
+macro.copyright.HTML    = "&copy;"
+macro.eacute.HTML       = "&eacute;"
+macro.gui               = "\\bold"
+macro.hr.HTML           = "<hr />"
+macro.iacute.HTML       = "&iacute;"
+macro.key               = "\\bold"
+macro.menu              = "\\bold"
+macro.note              = "\\bold{Note:}"
+macro.oslash.HTML       = "&oslash;"
+macro.ouml.HTML         = "&ouml;"
+macro.QA                = "\\e{Qt Assistant}"
+macro.QD                = "\\e{Qt Designer}"
+macro.QL                = "\\e{Qt Linguist}"
+macro.param             = "\\e"
+macro.raisedaster.HTML  = "<sup>*</sup>"
+macro.rarrow.HTML       = "&rarr;"
+macro.reg.HTML          = "<sup>&reg;</sup>"
+macro.return            = "Returns"
+macro.starslash         = "\\c{*/}"
+macro.begincomment      = "\\c{/*}"
+macro.endcomment        = "\\c{*/}"
+macro.uuml.HTML         = "&uuml;"
+macro.mdash.HTML        = "&mdash;"
+
+macro.beginfloatleft.HTML   = "<div style=\"float: left; margin-right: 2em\">"
+macro.beginfloatright.HTML  = "<div style=\"float: right; margin-left: 2em\">"
+macro.endfloat.HTML         = "</div>"
+macro.clearfloat.HTML       = "<br style=\"clear: both\" />"
+
+######################## qt-cpp-ignore.qdocconf
+Cpp.ignoretokens        = QAXFACTORY_EXPORT \
+                          QDESIGNER_COMPONENTS_LIBRARY \
+                          QDESIGNER_EXTENSION_LIBRARY \
+                          QDESIGNER_SDK_LIBRARY \
+                          QDESIGNER_SHARED_LIBRARY \
+                          QDESIGNER_UILIB_LIBRARY \
+                          QM_EXPORT_CANVAS \
+                          QM_EXPORT_DNS \
+                          QM_EXPORT_DOM \
+                          QM_EXPORT_FTP \
+                          QM_EXPORT_HTTP \
+                          QM_EXPORT_ICONVIEW \
+                          QM_EXPORT_NETWORK \
+                          QM_EXPORT_OPENGL \
+                          QM_EXPORT_OPENVG \
+                          QM_EXPORT_SQL \
+                          QM_EXPORT_TABLE \
+                          QM_EXPORT_WORKSPACE \
+                          QM_EXPORT_XML \
+                          QT_ASCII_CAST_WARN \
+                          QT_ASCII_CAST_WARN_CONSTRUCTOR \
+                          QT_BEGIN_HEADER \
+                          QT_DESIGNER_STATIC \
+                          QT_END_HEADER \
+                          QT_FASTCALL \
+                          QT_WIDGET_PLUGIN_EXPORT \
+                          Q_COMPAT_EXPORT \
+                          Q_CORE_EXPORT \
+                          Q_CORE_EXPORT_INLINE \
+                          Q_EXPLICIT \
+                          Q_EXPORT \
+                          Q_EXPORT_CODECS_CN \
+                          Q_EXPORT_CODECS_JP \
+                          Q_EXPORT_CODECS_KR \
+                          Q_EXPORT_PLUGIN \
+                          Q_GFX_INLINE \
+                          Q_AUTOTEST_EXPORT \
+                          Q_GUI_EXPORT \
+                          Q_GUI_EXPORT_INLINE \
+                          Q_GUI_EXPORT_STYLE_CDE \
+                          Q_GUI_EXPORT_STYLE_COMPACT \
+                          Q_GUI_EXPORT_STYLE_MAC \
+                          Q_GUI_EXPORT_STYLE_MOTIF \
+                          Q_GUI_EXPORT_STYLE_MOTIFPLUS \
+                          Q_GUI_EXPORT_STYLE_PLATINUM \
+                          Q_GUI_EXPORT_STYLE_POCKETPC \
+                          Q_GUI_EXPORT_STYLE_SGI \
+                          Q_GUI_EXPORT_STYLE_WINDOWS \
+                          Q_GUI_EXPORT_STYLE_WINDOWSXP \
+                          QHELP_EXPORT \
+                          Q_INLINE_TEMPLATE \
+                          Q_INTERNAL_WIN_NO_THROW \
+                          Q_NETWORK_EXPORT \
+                          Q_OPENGL_EXPORT \
+                          Q_OPENVG_EXPORT \
+                          Q_OUTOFLINE_TEMPLATE \
+                          Q_SQL_EXPORT \
+                          Q_SVG_EXPORT \
+                          Q_SCRIPT_EXPORT \
+                          Q_SCRIPTTOOLS_EXPORT \
+                          Q_TESTLIB_EXPORT \
+                          Q_TYPENAME \
+                          Q_XML_EXPORT \
+                          Q_XMLSTREAM_EXPORT \
+                          Q_XMLPATTERNS_EXPORT \
+                          QDBUS_EXPORT \
+                          QT_BEGIN_NAMESPACE \
+                          QT_BEGIN_INCLUDE_NAMESPACE \
+                          QT_END_NAMESPACE \
+                          QT_END_INCLUDE_NAMESPACE \
+                          PHONON_EXPORT \
+                          Q_DECLARATIVE_EXPORT \
+                          Q_GADGET \
+                          QWEBKIT_EXPORT
+Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
+                          Q_DECLARE_INTERFACE \
+                          Q_DECLARE_METATYPE \
+                          Q_DECLARE_OPERATORS_FOR_FLAGS \
+                          Q_DECLARE_PRIVATE \
+                          Q_DECLARE_PUBLIC \
+                          Q_DECLARE_SHARED \
+                          Q_DECLARE_TR_FUNCTIONS \
+                          Q_DECLARE_TYPEINFO \
+                          Q_DISABLE_COPY \
+                          QT_FORWARD_DECLARE_CLASS \
+                          Q_DUMMY_COMPARISON_OPERATOR \
+                          Q_ENUMS \
+                          Q_FLAGS \
+                          Q_INTERFACES \
+                          __attribute__ \
+                          K_DECLARE_PRIVATE \
+                          PHONON_OBJECT \
+                          PHONON_HEIR
+
+######################## qt-html-templates.qdocconf
+HTML.stylesheets        = classic.css
+HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\n" \
+                          "<tr>\n" \
+                          "<td align=\"left\" valign=\"top\" width=\"32\">" \
+                          "<a href=\"http://qt.nokia.com/\"><img src=\"images/qt-logo.png\" align=\"left\" border=\"0\" /></a>" \
+                          "</td>\n" \
+                          "<td width=\"1\">&nbsp;&nbsp;</td>" \
+                          "<td class=\"postheader\" valign=\"center\">" \
+                          "<a href=\"index.html\">" \
+                          "<font color=\"#004faf\">Home</font></a>&nbsp;&middot;" \
+                          " <a href=\"classes.html\">" \
+                          "<font color=\"#004faf\">All&nbsp;Classes</font></a>&nbsp;&middot;" \
+                          " <a href=\"functions.html\">" \
+                          "<font color=\"#004faf\">All&nbsp;Functions</font></a>&nbsp;&middot;" \
+                          " <a href=\"overviews.html\">" \
+                          "<font color=\"#004faf\">Overviews</font></a>" \
+                          "</td>" \
+                          "</tr></table>"
+
+HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
+                          "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
+                          "<td width=\"40%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
+                          "<td width=\"20%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
+                          "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \
+                          "</tr></table></div></address>"
+
+######################## qt-defines.qdocconf
+defines                 = Q_QDOC \
+                          QT_.*_SUPPORT \
+                          QT_.*_LIB \
+                          QT_COMPAT \
+                          QT_KEYPAD_NAVIGATION \
+                          QT3_SUPPORT \
+                          Q_WS_.* \
+                          Q_OS_.* \
+                          Q_BYTE_ORDER \
+                          QT_DEPRECATED \
+                          Q_NO_USING_KEYWORD \
+                          __cplusplus
+
+versionsym              = QT_VERSION_STR
+
+codeindent              = 1
+
+# Files not referenced in any qdoc file (last four needed by qtdemo)
+# See also qhp.Qt.extraFiles
+extraimages.HTML        = qt-logo \
+                          trolltech-logo \
+                          taskmenuextension-example.png \
+                          coloreditorfactoryimage.png \
+                          dynamiclayouts-example.png \
+                          stylesheet-coffee-plastique.png
+
+######################## qt.qdocconf
+
+project                 = Qt
+versionsym              =
+version                 = %VERSION%
+description             = Qt Reference Documentation
+url                     = http://qt.nokia.com/doc/@PYSIDE_QT_VERSION@
+
+edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg \
+                          QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
+                          QtDesigner QtAssistant QAxContainer Phonon \
+                          QAxServer QtUiTools QtTest QtDBus
+edition.DesktopLight.modules = QtCore QtDBus QtGui Qt3SupportLight QtTest
+edition.DesktopLight.groups       = -graphicsview-api
+
+qhp.projects            = Qt
+
+qhp.Qt.file                = qt.qhp
+qhp.Qt.namespace           = com.trolltech.qt.460
+qhp.Qt.virtualFolder       = qdoc
+qhp.Qt.indexTitle          = Qt Reference Documentation
+qhp.Qt.indexRoot           =
+
+# Files not referenced in any qdoc file (last four are needed by qtdemo)
+# See also extraimages.HTML
+qhp.Qt.extraFiles          = classic.css \
+                             images/qt-logo.png \
+                             images/taskmenuextension-example.png \
+                             images/coloreditorfactoryimage.png \
+                             images/dynamiclayouts-example.png \
+                             images/stylesheet-coffee-plastique.png
+
+qhp.Qt.filterAttributes    = qt @PYSIDE_QT_VERSION@ qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt @PYSIDE_QT_VERSION@
+qhp.Qt.customFilters.Qt.filterAttributes = qt @PYSIDE_QT_VERSION@
+qhp.Qt.subprojects         = classes overviews examples
+qhp.Qt.subprojects.classes.title = Classes
+qhp.Qt.subprojects.classes.indexTitle = Qt's Classes
+qhp.Qt.subprojects.classes.selectors = class fake:headerfile
+qhp.Qt.subprojects.classes.sortPages = true
+qhp.Qt.subprojects.overviews.title = Overviews
+qhp.Qt.subprojects.overviews.indexTitle = All Overviews and HOWTOs
+qhp.Qt.subprojects.overviews.selectors = fake:page,group,module
+qhp.Qt.subprojects.examples.title = Tutorials and Examples
+qhp.Qt.subprojects.examples.indexTitle = Qt Examples
+qhp.Qt.subprojects.examples.selectors = fake:example
+
+language                = Cpp
+
+headerdirs              = @QT_SRC_DIR@/src \
+                          @QT_SRC_DIR@/extensions/activeqt \
+                          @QT_SRC_DIR@/tools/assistant/lib \
+                          @QT_SRC_DIR@/tools/assistant/compat/lib \
+                          @QT_SRC_DIR@/tools/designer/src/uitools \
+                          @QT_SRC_DIR@/tools/designer/src/lib/extension \
+                          @QT_SRC_DIR@/tools/designer/src/lib/sdk \
+                          @QT_SRC_DIR@/tools/designer/src/lib/uilib \
+                          @QT_SRC_DIR@/tools/qtestlib/src \
+                          @QT_SRC_DIR@/tools/qdbus/src
+sourcedirs              = @QT_SRC_DIR@/src \
+                          @QT_SRC_DIR@/doc/src \
+                          @QT_SRC_DIR@/extensions/activeqt \
+                          @QT_SRC_DIR@/tools/assistant/lib \
+                          @QT_SRC_DIR@/tools/assistant/compat/lib \
+                          @QT_SRC_DIR@/tools/designer/src/uitools \
+                          @QT_SRC_DIR@/tools/designer/src/lib/extension \
+                          @QT_SRC_DIR@/tools/designer/src/lib/sdk \
+                          @QT_SRC_DIR@/tools/designer/src/lib/uilib \
+                          @QT_SRC_DIR@/tools/qtestlib/src \
+                          @QT_SRC_DIR@/tools/qdbus
+
+excludedirs             = @QT_SRC_DIR@/src/3rdparty/clucene \
+                          @QT_SRC_DIR@/src/3rdparty/des \
+                          @QT_SRC_DIR@/src/3rdparty/freetype \
+                          @QT_SRC_DIR@/src/3rdparty/harfbuzz \
+                          @QT_SRC_DIR@/src/3rdparty/kdebase \
+                          @QT_SRC_DIR@/src/3rdparty/libjpeg \
+                          @QT_SRC_DIR@/src/3rdparty/libmng \
+                          @QT_SRC_DIR@/src/3rdparty/libpng \
+                          @QT_SRC_DIR@/src/3rdparty/libtiff \
+                          @QT_SRC_DIR@/src/3rdparty/md4 \
+                          @QT_SRC_DIR@/src/3rdparty/md5 \
+                          @QT_SRC_DIR@/src/3rdparty/patches \
+                          @QT_SRC_DIR@/src/3rdparty/sha1 \
+                          @QT_SRC_DIR@/src/3rdparty/sqlite \
+                          @QT_SRC_DIR@/src/3rdparty/webkit/JavaScriptCore \
+                          @QT_SRC_DIR@/src/3rdparty/webkit/WebCore \
+                          @QT_SRC_DIR@/src/3rdparty/wintab \
+                          @QT_SRC_DIR@/src/3rdparty/zlib \
+                          @QT_SRC_DIR@/doc/src/snippets \
+                          @QT_SRC_DIR@/src/3rdparty/phonon/gstreamer \
+                          @QT_SRC_DIR@/src/3rdparty/phonon/ds9 \
+                          @QT_SRC_DIR@/src/3rdparty/phonon/qt7 \
+                          @QT_SRC_DIR@/src/3rdparty/phonon/mmf \
+                          @QT_SRC_DIR@/src/3rdparty/phonon/waveout
+
+sources.fileextensions  = "*.cpp *.qdoc *.mm"
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"
+examples.imageextensions = "*.png"
+
+exampledirs             = @QT_SRC_DIR@/doc/src \
+                          @QT_SRC_DIR@/examples \
+                          @QT_SRC_DIR@/examples/tutorials \
+                          @QT_SRC_DIR@ \
+                          @QT_SRC_DIR@/qmake/examples \
+                          @QT_SRC_DIR@/src/3rdparty/webkit/WebKit/qt/docs
+imagedirs               = @QT_SRC_DIR@/doc/src/images \
+                          @QT_SRC_DIR@/examples
+outputdir               = @QT_SRC_DIR@/doc/html
+tagfile                 = @QT_SRC_DIR@/doc/html/qt.tags
+base                    = file:@QT_SRC_DIR@/doc/html
+
+HTML.generatemacrefs    = "true"
+
+######################## pyside.qdocconf
+quotinginformation      = true
+exampledirs             = @QT_SRC_DIR@/doc/src \
+                          @QT_SRC_DIR@/examples \
+                          @QT_SRC_DIR@/examples/tutorials \
+                          @QT_SRC_DIR@ \
+                          @QT_SRC_DIR@/qmake/examples \
+                          @QT_SRC_DIR@/src/3rdparty/webkit/WebKit/qt/docs
+
+imagedirs               = @QT_SRC_DIR@/doc/src/images \
+                          @QT_SRC_DIR@/examples \
+                          @QT_SRC_DIR@/doc/src/declarative/pics \
+                          @QT_SRC_DIR@/doc/src/template/image
+
+outputdir               = @DOC_DATA_DIR@
+outputformats           = WebXML
+
+generateindex           = false
+url                     = .
diff --git a/doc/typesystem_doc.xml.in b/doc/typesystem_doc.xml.in
new file mode 100644
index 000000000..eaf517852
--- /dev/null
+++ b/doc/typesystem_doc.xml.in
@@ -0,0 +1,89 @@
+<?xml version="1.0" ?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide">
+    <suppress-warning text="File containing conversion code for *" />
+    <suppress-warning text="File for inject code not exist: *" />
+
+    <load-typesystem name="typesystem_core.xml" generate="yes"/>
+    @if_QtDeclarative@
+    <load-typesystem name="typesystem_declarative.xml" generate="yes"/>
+    @end_QtDeclarative@
+
+    @if_QtGui@
+    <load-typesystem name="typesystem_gui.xml" generate="yes"/>
+    @end_QtGui@
+
+    @if_QtHelp@
+    <load-typesystem name="typesystem_help.xml" generate="yes" />
+    @end_QtHelp@
+
+    @if_Maemo5@
+    <load-typesystem name="typesystem_maemo5.xml" generate="yes" />
+    @end_Maemo5@
+
+    @if_Multimedia@
+    <load-typesystem name="typesystem_multimedia.xml" generate="yes" />
+    @end_Multimedia@
+
+    @if_QtNetwork@
+    <load-typesystem name="typesystem_network.xml" generate="yes" />
+    @end_QtNetwork@
+
+    @if_QtOpenGL@
+    <load-typesystem name="typesystem_opengl.xml" generate="yes" />
+    @end_QtOpenGL@
+
+    @if_QtScript@
+    <load-typesystem name="typesystem_script.xml" generate="yes" />
+    @end_QtScript@
+
+    @if_QtScriptTools@
+    <load-typesystem name="typesystem_scripttools.xml" generate="yes" />
+    @end_QtScriptTools@
+
+    @if_QtSql@
+    <load-typesystem name="typesystem_sql.xml" generate="yes" />
+    @end_QtSql@
+
+    @if_QtSvg@
+    <load-typesystem name="typesystem_svg.xml" generate="yes" />
+    @end_QtSvg@
+
+    @if_QtTest@
+    <load-typesystem name="typesystem_test.xml" generate="yes" />
+    @end_QtTest@
+
+    @if_QtUiTools@
+    <load-typesystem name="typesystem_uitools.xml" generate="yes" />
+    @end_QtUiTools@
+
+    @if_QtWebKit@
+    <load-typesystem name="typesystem_webkit.xml" generate="yes" />
+    @end_QtWebKit@
+
+    @if_QtXml@
+    <load-typesystem name="typesystem_xml.xml" generate="yes" />
+    @end_QtXml@
+
+    @if_QtXmlPatterns@
+    <load-typesystem name="typesystem_xmlpatterns.xml" generate="yes" />
+    @end_QtXmlPatterns@
+</typesystem>
\ No newline at end of file