diff options
| author | Leena Miettinen <[email protected]> | 2020-01-23 11:45:07 +0100 |
|---|---|---|
| committer | Leena Miettinen <[email protected]> | 2020-01-27 09:05:07 +0000 |
| commit | 5fc456dd2283b2d1e6c4e6d34856052658f34cc4 (patch) | |
| tree | 7a7cd26a33014e401536a149fa47f6586b68c247 /doc/CMakeLists.txt | |
| parent | c9f90047ac701416e439f492069c1a0bb364fc08 (diff) | |
Doc: Rearrange files in the doc folder
Source and configuration files for each manual are now located in a
separate subdirectory, with common configuration files in doc/config.
doc
|_config
|_qtcreator
|_qtcreatordev
|_qtdesignstudio
Edit the config files accordingly.
Change-Id: Idc747a7c16e84f3e06add91234dc5fc908e64cc5
Reviewed-by: Eike Ziller <[email protected]>
Diffstat (limited to 'doc/CMakeLists.txt')
| -rw-r--r-- | doc/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index c009b677fff..c8876613bc0 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -202,7 +202,7 @@ if (WITH_ONLINE_DOCS OR WITH_DOCS) set(_qch_params "QCH;QCH_DIR;${PROJECT_BINARY_DIR}/${IDE_DOC_PATH}") endif() - set(_qdoc_params HTML_DIR "${PROJECT_BINARY_DIR}/doc") + set(_qdoc_params HTML_DIR "${PROJECT_BINARY_DIR}/doc/html") list(APPEND _qdoc_params INDEXES "${QT_INSTALL_DOCS}" "${PROJECT_BINARY_DIR}/doc") list(APPEND _qdoc_params INSTALL_DIR "${IDE_DOC_PATH}") @@ -229,15 +229,15 @@ if (WITH_ONLINE_DOCS OR WITH_DOCS) QT_INSTALL_DOCS QDOC_INDEX_DIR) if (WITH_DOCS) - qdoc_build_qdocconf_file("qtcreator.qdocconf" ${_qch_params} ${_qdoc_params}) + qdoc_build_qdocconf_file("qtcreator/qtcreator.qdocconf" ${_qch_params} ${_qdoc_params}) if (BUILD_DEVELOPER_DOCS) - qdoc_build_qdocconf_file("api/qtcreator-dev.qdocconf" ${_qch_params} ${_qdoc_params}) + qdoc_build_qdocconf_file("qtcreatordev/qtcreator-dev.qdocconf" ${_qch_params} ${_qdoc_params}) endif() endif() if(WITH_ONLINE_DOCS) - qdoc_build_qdocconf_file("qtcreator-online.qdocconf" ${_qdoc_params}) + qdoc_build_qdocconf_file("qtcreator/qtcreator-online.qdocconf" ${_qdoc_params}) if (BUILD_DEVELOPER_DOCS) - qdoc_build_qdocconf_file("api/qtcreator-dev-online.qdocconf" ${_qdoc_params}) + qdoc_build_qdocconf_file("qtcreatordev/qtcreator-dev-online.qdocconf" ${_qdoc_params}) endif() endif() endif() |