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 <eike.ziller@qt.io>

.gitignore

@@ -122,9 +122,9 @@ compile_commands.json
 /dist/gdb/source/
 /dist/gdb/staging/
 /doc/qbs/
-/doc/qtcreator/
+/doc/html/qtcreator/
-/doc/qtcreator-dev/
+/doc/html/qtcreator-dev/
-/doc/pluginhowto/html/
+/doc/html/qtdesignstudio/
 /lib/
 /lib64/
 /libexec/

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()

doc/doc.pri

@@ -1,7 +1,7 @@
 build_online_docs: \
-    DOC_FILES += $$PWD/qtcreator-online.qdocconf $$PWD/api/qtcreator-dev-online.qdocconf
+    DOC_FILES += $$PWD/qtcreator/qtcreator-online.qdocconf $$PWD/qtcreatordev/qtcreator-dev-online.qdocconf
 else: \
-    DOC_FILES += $$PWD/qtcreator.qdocconf $$PWD/api/qtcreator-dev.qdocconf
+    DOC_FILES += $$PWD/qtcreator/qtcreator.qdocconf $$PWD/qtcreatordev/qtcreator-dev.qdocconf
 
 include(../docs.pri)
 

doc/doc_targets.pri

@@ -30,7 +30,7 @@ QT_TOOL_ENV =
 
 !build_online_docs: qtPrepareTool(QHELPGENERATOR, qhelpgenerator)
 
-DOCS_BASE_OUTDIR = $$OUT_PWD/doc
+DOCS_BASE_OUTDIR = $$OUT_PWD/doc/html
 DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS])
 for (index_path, DOC_INDEX_PATHS): \
     DOC_INDEXES += -indexdir $$shell_quote($$index_path)

doc/qtcreator/config/qtcreator-project.qdocconf

@@ -5,32 +5,31 @@ url         = http://doc.qt.io/$IDE_ID
 headerdirs =
 sourcedirs = ../src
 imagedirs = ../images \
-            ../templates/images \
+            ../../../src/libs/qmleditorwidgets/images \
-            ../../src/libs/qmleditorwidgets/images \
+            ../../../src/libs/utils/images \
-            ../../src/libs/utils/images \
+            ../../../src/plugins/android/images \
-            ../../src/plugins/android/images \
+            ../../../src/plugins/autotest/images \
-            ../../src/plugins/autotest/images \
+            ../../../src/plugins/classview/images \
-            ../../src/plugins/classview/images \
+            ../../../src/plugins/coreplugin/images \
-            ../../src/plugins/coreplugin/images \
+            ../../../src/plugins/debugger/images \
-            ../../src/plugins/debugger/images \
+            ../../../src/plugins/diffeditor/images \
-            ../../src/plugins/diffeditor/images \
+            ../../../src/plugins/help/images \
-            ../../src/plugins/help/images \
+            ../../../src/plugins/projectexplorer/images \
-            ../../src/plugins/projectexplorer/images \
+            ../../../src/plugins/qmldesigner/components/componentcore/images \
-            ../../src/plugins/qmldesigner/components/componentcore/images \
+            ../../../src/plugins/qmldesigner/components/formeditor \
-            ../../src/plugins/qmldesigner/components/formeditor \
+            ../../../src/plugins/qmldesigner/components/navigator \
-            ../../src/plugins/qmldesigner/components/navigator \
+            ../../../src/plugins/qmldesigner/components/timelineeditor/images \
-            ../../src/plugins/qmldesigner/components/timelineeditor/images \
+            ../../../src/plugins/qmldesigner/qmlpreviewplugin/images \
-            ../../src/plugins/qmldesigner/qmlpreviewplugin/images \
+            ../../../src/plugins/scxmleditor/common/images \
-            ../../src/plugins/scxmleditor/common/images \
+            ../../../src/plugins/texteditor/images \
-            ../../src/plugins/texteditor/images \
+            ../../../src/plugins/valgrind/images \
-            ../../src/plugins/valgrind/images \
+            ../../../src/plugins/welcome/images
-            ../../src/plugins/welcome/images
 
 exampledirs = ../examples
 examples.fileextensions += *.qml *.svg
 
-HTML.extraimages         = images/commercial.png
+HTML.extraimages         = ../../config/images/commercial.png
-qhp.QtCreator.extraFiles = images/commercial.png
+qhp.QtCreator.extraFiles = ../../config/images/commercial.png
 
 depends +=    qtwidgets \
               qtcmake \
@@ -52,9 +51,9 @@ depends +=    qtwidgets \
               qtuitools \
               qtxml
 
-include(macros.qdocconf)
+include(../../config/macros.qdocconf)
-include(qt-cpp-ignore.qdocconf)
+include(../../config/qt-cpp-ignore.qdocconf)
-include(qt-defines.qdocconf)
+include(../../config/qt-defines.qdocconf)
 
 defines += qtcreator