diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-30 14:02:36 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-01 20:41:54 +0000 |
| commit | 326befef136b5a20dc85a268b65a1a621c5293bf (patch) | |
| tree | e5f785e2a950e9d59cbf0bc608fafe0b7a8dd9c9 /sources/pyside2/doc | |
| parent | 6e92704e8c5cec02e29f24e693ba444cf6ee41af (diff) | |
qdoc: Add more include paths
Add the mkspec directory and the subdirectories containing the
private module headers as is done in a standard Qt documentation build.
This reduces the number of "Cannot tie this documentation to anything"
warnings.
Task-number: PYSIDE-363
Change-Id: I7231ada32970a0e3128bcf9ab38014025afe3751
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/pyside2/doc')
| -rw-r--r-- | sources/pyside2/doc/CMakeLists.txt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt index 5a7679102..e364437a2 100644 --- a/sources/pyside2/doc/CMakeLists.txt +++ b/sources/pyside2/doc/CMakeLists.txt @@ -21,7 +21,11 @@ file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/pyside.qdocconf ${CMAKE_CURRENT_LIST_DIR}/ # - 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}") + +# The last element of the include list is the mkspec directory containing qplatformdefs.h +list(GET Qt5Core_INCLUDE_DIRS -1 mkspecInclude) +set(QDOC_INCPATH -I "${QT_INCLUDE_DIR}" -I "${mkspecInclude}") + file(READ "${pyside2_BINARY_DIR}/pyside2_global.h" docHeaderContents) file(READ "typesystem_doc.xml.in" typeSystemDocXmlContents) @@ -35,8 +39,10 @@ foreach(module ${all_module_shortnames}) 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}") + list(APPEND QDOC_INCPATH + -I "${QT_INCLUDE_DIR}Qt${module}" + -I "${QT_INCLUDE_DIR}Qt${module}/${Qt5Core_VERSION}" + -I "${QT_INCLUDE_DIR}Qt${module}/${Qt5Core_VERSION}/Qt${module}") set(docHeaderContents "${docHeaderContents}\n#include <Qt${module}/Qt${module}>") set(typeSystemDocXmlContents "${typeSystemDocXmlContents}\n<load-typesystem name=\"Qt${module}/typesystem_${lowerModule}.xml\" generate=\"yes\"/>") |