From ce8a978d11460b26694cafcfa24bb70098afd40a Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 24 Oct 2017 10:25:03 +0200 Subject: Revive PySide2 API documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Rename qdoc3 to qdoc. - Run qdoc in single-exec mode. - Qt 5 documentation modules are added to the build from /qtmodules (see existing examples in that folder). - Fix modules.rst Done-with: Venugopal Shivashankar Done-with: Topi Reiniö Task-number: PYSIDE-363 Change-Id: I47c3ec60c3132517424aef6c066a51c955e5bf2d Reviewed-by: Topi Reiniö --- sources/pyside2/doc/CMakeLists.txt | 74 +++++- sources/pyside2/doc/modules.rst | 26 +- sources/pyside2/doc/pyside-config.qdocconf.in | 10 + sources/pyside2/doc/pyside.qdocconf.in | 269 --------------------- .../doc/qtmodules/pyside-qtcore.qdocconf.in | 2 + .../pyside2/doc/qtmodules/pyside-qtgui.qdocconf.in | 2 + .../doc/qtmodules/pyside-qtnetwork.qdocconf.in | 2 + .../doc/qtmodules/pyside-qtwidgets.qdocconf.in | 2 + sources/pyside2/doc/src/README.md | 1 + sources/pyside2/doc/typesystem_doc.xml.in | 64 +---- 10 files changed, 95 insertions(+), 357 deletions(-) create mode 100644 sources/pyside2/doc/pyside-config.qdocconf.in delete mode 100644 sources/pyside2/doc/pyside.qdocconf.in create mode 100644 sources/pyside2/doc/qtmodules/pyside-qtcore.qdocconf.in create mode 100644 sources/pyside2/doc/qtmodules/pyside-qtgui.qdocconf.in create mode 100644 sources/pyside2/doc/qtmodules/pyside-qtnetwork.qdocconf.in create mode 100644 sources/pyside2/doc/qtmodules/pyside-qtwidgets.qdocconf.in create mode 100644 sources/pyside2/doc/src/README.md (limited to 'sources/pyside2/doc') diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt index 14af9735b..5a7679102 100644 --- a/sources/pyside2/doc/CMakeLists.txt +++ b/sources/pyside2/doc/CMakeLists.txt @@ -1,11 +1,63 @@ +cmake_minimum_required(VERSION 3.1) +cmake_policy(VERSION 3.1) + project(doc) -set(DOC_DATA_DIR "${CMAKE_CURRENT_BINARY_DIR}/qdoc3-output") +if (WIN32) + set(PATH_SEP "\;") +else() + set(PATH_SEP ":") +endif() + +set(DOC_DATA_DIR "${CMAKE_CURRENT_BINARY_DIR}/qdoc-output") +configure_file("pyside-config.qdocconf.in" "${CMAKE_CURRENT_LIST_DIR}/pyside-config.qdocconf" @ONLY) + +get_filename_component(ROOT ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY) +set(TS_ROOT "${ROOT}/PySide2") + +file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/pyside.qdocconf ${CMAKE_CURRENT_LIST_DIR}/pyside.qdocconf.in) + +# For Qt modules that are part of the documentation build: +# - Configure the module docconf file +# - Write shiboken header consisting of pyside2_global.h and module includes +# - Build include path for qdoc for shiboken +set(QDOC_INCPATH -I "${QT_INCLUDE_DIR}") +file(READ "${pyside2_BINARY_DIR}/pyside2_global.h" docHeaderContents) +file(READ "typesystem_doc.xml.in" typeSystemDocXmlContents) + +foreach(module ${all_module_shortnames}) + string(TOLOWER "${module}" lowerModule) + set(docConf "${CMAKE_CURRENT_LIST_DIR}/qtmodules/pyside-qt${lowerModule}.qdocconf.in") + if(EXISTS "${docConf}") + string(REGEX REPLACE "(^.*)\.in" "\\1" OUTFILE ${docConf}) + get_filename_component(BASENAME ${OUTFILE} NAME) + configure_file(${docConf} "${CMAKE_CURRENT_LIST_DIR}/qtmodules/${BASENAME}" @ONLY) + file(APPEND "pyside.qdocconf.in" "\@CMAKE_CURRENT_LIST_DIR\@/qtmodules/${BASENAME}\n") + + # -- @TODO fix this for macOS frameworks. + list(APPEND QDOC_INCPATH -I) + list(APPEND QDOC_INCPATH "${QT_INCLUDE_DIR}Qt${module}") + + set(docHeaderContents "${docHeaderContents}\n#include ") + set(typeSystemDocXmlContents "${typeSystemDocXmlContents}\n") + endif() +endforeach() + +set(typeSystemDocXmlContents "${typeSystemDocXmlContents}\n\n") +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/typesystem_doc.xml" "${typeSystemDocXmlContents}") + +set(docHeader "${pyside2_BINARY_DIR}/qdoc.h") +file(WRITE ${docHeader} "${docHeaderContents}") + configure_file("pyside.qdocconf.in" "pyside.qdocconf" @ONLY) -add_custom_target(qdoc3 - COMMAND qdoc3 pyside.qdocconf - COMMENT "Running qdoc3 against Qt source code..." +set(QDOC_TYPESYSTEM_PATH "${pyside2_SOURCE_DIR}${PATH_SEP}${pyside2_BINARY_DIR}") + +add_custom_target(qdoc + # Use dummy Qt version information, QDoc needs it but has no effect on WebXML output + COMMAND ${CMAKE_COMMAND} -E env BUILDDIR=${CMAKE_CURRENT_LIST_DIR}/src QT_INSTALL_DOCS=${QT_SRC_DIR}/doc QT_VERSION=1.0.0 QT_VER=1.0 QT_VERSION_TAG=100 + qdoc pyside.qdocconf ${QDOC_INCPATH} -single-exec -installdir ${DOC_DATA_DIR} -outputdir ${DOC_DATA_DIR} + COMMENT "Running qdoc against Qt source code..." SOURCE "pyside.qdocconf") add_custom_target(apidoc @@ -15,25 +67,23 @@ add_custom_target(apidoc # create conf.py based on conf.py.in configure_file("conf.py.in" "rst/conf.py" @ONLY) -configure_file(typesystem_doc.xml.in typesystem_doc.xml @ONLY) add_custom_target("docrsts" - COMMAND ${SHIBOKEN_BINARY} --generator-set=qtdoc - ${pyside2_BINARY_DIR}/pyside_global.h - --include-paths="${QT_INCLUDE_DIR}${PATH_SEP}${pyside2_SOURCE_DIR}" + COMMAND ${SHIBOKEN_BINARY} --generator-set=qtdoc ${docHeader} + --include-paths="${QT_INCLUDE_DIR}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${TS_ROOT}" --api-version=${SUPPORTED_QT_VERSION} - --typesystem-paths="${pyside2_SOURCE_DIR}${PATH_SEP}${QtCore_SOURCE_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}${PATH_SEP}${QtHelp_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}" + --typesystem-paths="${QDOC_TYPESYSTEM_PATH}" --library-source-dir=${QT_SRC_DIR} - --documentation-data-dir=${DOC_DATA_DIR} + --documentation-data-dir=${DOC_DATA_DIR}/webxml --output-directory=${CMAKE_CURRENT_BINARY_DIR}/rst - --documentation-code-snippets-dir=${CMAKE_CURRENT_SOURCE_DIR}/codesnippets${PATH_SEP}${CMAKE_CURRENT_SOURCE_DIR}/codesnippets/examples + --documentation-code-snippets-dir=${CMAKE_CURRENT_SOURCE_DIR}/codesnippets/doc/src/snippets${PATH_SEP}${CMAKE_CURRENT_SOURCE_DIR}/codesnippets/examples --documentation-extra-sections-dir=${CMAKE_CURRENT_SOURCE_DIR}/extras ${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) +add_dependencies(docrsts qdoc) # #create devhelp file # add_custom_target(apidevhelp diff --git a/sources/pyside2/doc/modules.rst b/sources/pyside2/doc/modules.rst index 0faa629ad..3bf0f2abb 100644 --- a/sources/pyside2/doc/modules.rst +++ b/sources/pyside2/doc/modules.rst @@ -6,16 +6,16 @@ Qt is splitted in several modules. .. toctree:: :maxdepth: 1 - PySide/QtCore/index.rst - PySide/QtGui/index.rst - PySide/QtHelp/index.rst - PySide/QtMultimedia/index.rst - PySide/QtNetwork/index.rst - PySide/QtOpenGL/index.rst - PySide/QtScript/index.rst - PySide/QtScriptTools/index.rst - PySide/QtSql/index.rst - PySide/QtSvg/index.rst - PySide/QtUiTools/index.rst - PySide/QtXml/index.rst - PySide/QtWebKit/index.rst + PySide2/QtCore/index.rst + PySide2/QtGui/index.rst + PySide2/QtHelp/index.rst + PySide2/QtMultimedia/index.rst + PySide2/QtNetwork/index.rst + PySide2/QtOpenGL/index.rst + PySide2/QtScript/index.rst + PySide2/QtScriptTools/index.rst + PySide2/QtSql/index.rst + PySide2/QtSvg/index.rst + PySide2/QtUiTools/index.rst + PySide2/QtXml/index.rst + PySide2/QtWebKit/index.rst diff --git a/sources/pyside2/doc/pyside-config.qdocconf.in b/sources/pyside2/doc/pyside-config.qdocconf.in new file mode 100644 index 000000000..4a9af5994 --- /dev/null +++ b/sources/pyside2/doc/pyside-config.qdocconf.in @@ -0,0 +1,10 @@ +buildversion = @PYSIDE_QT_VERSION@ +navigation.homepage = PySide + +outputdir = @DOC_DATA_DIR@ +outputformats = WebXML +WebXML.quotinginformation = true +WebXML.nosubdirs = true +WebXML.outputsubdir = webxml + +spurious += "Hostile character .*" diff --git a/sources/pyside2/doc/pyside.qdocconf.in b/sources/pyside2/doc/pyside.qdocconf.in deleted file mode 100644 index 9672d6103..000000000 --- a/sources/pyside2/doc/pyside.qdocconf.in +++ /dev/null @@ -1,269 +0,0 @@ -######################## 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 = "
" -macro.BR.HTML = "
" -macro.copyright.HTML = "©" -macro.eacute.HTML = "é" -macro.gui = "\\bold" -macro.hr.HTML = "
" -macro.iacute.HTML = "í" -macro.key = "\\bold" -macro.menu = "\\bold" -macro.note = "\\bold{Note:}" -macro.oslash.HTML = "ø" -macro.ouml.HTML = "ö" -macro.QA = "\\e{Qt Assistant}" -macro.QD = "\\e{Qt Designer}" -macro.QL = "\\e{Qt Linguist}" -macro.QQV = "\\e{Qt QML Viewer}" -macro.qmlbasictype = "\\e" -macro.param = "\\e" -macro.raisedaster.HTML = "*" -macro.rarrow.HTML = "→" -macro.reg.HTML = "®" -macro.return = "Returns" -macro.starslash = "\\c{*/}" -macro.begincomment = "\\c{/*}" -macro.endcomment = "\\c{*/}" -macro.uuml.HTML = "ü" -macro.mdash.HTML = "—" - -macro.beginfloatleft.HTML = "
" -macro.beginfloatright.HTML = "
" -macro.endfloat.HTML = "
" -macro.clearfloat.HTML = "
" - -######################## 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 \ - 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 \ - Q_PRIVATE_PROPERTY \ - Q_DECLARE_PRIVATE_D \ - Q_CLASSINFO - -######################## 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 - -######################## qt.qdocconf - -project = Qt -versionsym = -version = @PYSIDE_QT_VERSION@ -description = Qt Reference Documentation -url = http://www.pyside.org/docs/pyside-@PYSIDE_QT_VERSION@ - -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 \ - @pyside_SOURCE_DIR@ -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 \ - @pyside_SOURCE_DIR@ - -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@/doc/src/ja_JP \ - @QT_SRC_DIR@/doc/src/zh_CN - -sources.fileextensions = "*.cpp *.qdoc *.mm" -examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp" -examples.imageextensions = "*.png" - -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/sources/pyside2/doc/qtmodules/pyside-qtcore.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtcore.qdocconf.in new file mode 100644 index 000000000..5fb7248c9 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtcore.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/src/corelib/doc/qtcore.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtgui.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtgui.qdocconf.in new file mode 100644 index 000000000..77e7e6e18 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtgui.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/src/gui/doc/qtgui.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtnetwork.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtnetwork.qdocconf.in new file mode 100644 index 000000000..addec9aee --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtnetwork.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/src/network/doc/qtnetwork.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtwidgets.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtwidgets.qdocconf.in new file mode 100644 index 000000000..90e887f38 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtwidgets.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/src/widgets/doc/qtwidgets.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/src/README.md b/sources/pyside2/doc/src/README.md new file mode 100644 index 000000000..df37cf691 --- /dev/null +++ b/sources/pyside2/doc/src/README.md @@ -0,0 +1 @@ +Any qdoc source files in this directory will be parsed when generating docs. diff --git a/sources/pyside2/doc/typesystem_doc.xml.in b/sources/pyside2/doc/typesystem_doc.xml.in index 50cb2a710..78ccb5bc9 100644 --- a/sources/pyside2/doc/typesystem_doc.xml.in +++ b/sources/pyside2/doc/typesystem_doc.xml.in @@ -52,67 +52,6 @@ - - - - @if_QtNetwork@ - - @end_QtNetwork@ - - @if_QtXml@ - - @end_QtXml@ - - @if_QtScript@ - - @end_QtScript@ - - @if_QtGui@ - - @end_QtGui@ - - @if_QtHelp@ - - @end_QtHelp@ - - @if_QtMultimedia@ - - @end_QtMultimedia@ - - @if_QtOpenGL@ - - @end_QtOpenGL@ - - @if_QtScriptTools@ - - @end_QtScriptTools@ - - @if_QtSql@ - - @end_QtSql@ - - @if_QtSvg@ - - @end_QtSvg@ - - @if_QtTest@ - - @end_QtTest@ - - @if_QtUiTools@ - - @end_QtUiTools@ - - @if_QtWebKit@ - - @end_QtWebKit@ - - - @if_QtXmlPatterns@ - - @end_QtXmlPatterns@ - - @@ -121,5 +60,4 @@ - - + -- cgit v1.2.3