diff --git a/.gitignore b/.gitignore index 65552ef8de4..a16cefa8439 100644 --- a/.gitignore +++ b/.gitignore @@ -122,9 +122,9 @@ compile_commands.json /dist/gdb/source/ /dist/gdb/staging/ /doc/qbs/ -/doc/qtcreator/ -/doc/qtcreator-dev/ -/doc/pluginhowto/html/ +/doc/html/qtcreator/ +/doc/html/qtcreator-dev/ +/doc/html/qtdesignstudio/ /lib/ /lib64/ /libexec/ 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() diff --git a/doc/doc.pri b/doc/doc.pri index 67a3032bfb3..28c6be8520b 100644 --- a/doc/doc.pri +++ b/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) diff --git a/doc/doc_targets.pri b/doc/doc_targets.pri index 16fbfa2b4ef..808d5e9fcfd 100644 --- a/doc/doc_targets.pri +++ b/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) diff --git a/doc/config/qtcreator-project.qdocconf b/doc/qtcreator/config/qtcreator-project.qdocconf similarity index 56% rename from doc/config/qtcreator-project.qdocconf rename to doc/qtcreator/config/qtcreator-project.qdocconf index ed365b06d83..85602350171 100644 --- a/doc/config/qtcreator-project.qdocconf +++ b/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/utils/images \ - ../../src/plugins/android/images \ - ../../src/plugins/autotest/images \ - ../../src/plugins/classview/images \ - ../../src/plugins/coreplugin/images \ - ../../src/plugins/debugger/images \ - ../../src/plugins/diffeditor/images \ - ../../src/plugins/help/images \ - ../../src/plugins/projectexplorer/images \ - ../../src/plugins/qmldesigner/components/componentcore/images \ - ../../src/plugins/qmldesigner/components/formeditor \ - ../../src/plugins/qmldesigner/components/navigator \ - ../../src/plugins/qmldesigner/components/timelineeditor/images \ - ../../src/plugins/qmldesigner/qmlpreviewplugin/images \ - ../../src/plugins/scxmleditor/common/images \ - ../../src/plugins/texteditor/images \ - ../../src/plugins/valgrind/images \ - ../../src/plugins/welcome/images + ../../../src/libs/qmleditorwidgets/images \ + ../../../src/libs/utils/images \ + ../../../src/plugins/android/images \ + ../../../src/plugins/autotest/images \ + ../../../src/plugins/classview/images \ + ../../../src/plugins/coreplugin/images \ + ../../../src/plugins/debugger/images \ + ../../../src/plugins/diffeditor/images \ + ../../../src/plugins/help/images \ + ../../../src/plugins/projectexplorer/images \ + ../../../src/plugins/qmldesigner/components/componentcore/images \ + ../../../src/plugins/qmldesigner/components/formeditor \ + ../../../src/plugins/qmldesigner/components/navigator \ + ../../../src/plugins/qmldesigner/components/timelineeditor/images \ + ../../../src/plugins/qmldesigner/qmlpreviewplugin/images \ + ../../../src/plugins/scxmleditor/common/images \ + ../../../src/plugins/texteditor/images \ + ../../../src/plugins/valgrind/images \ + ../../../src/plugins/welcome/images exampledirs = ../examples examples.fileextensions += *.qml *.svg -HTML.extraimages = images/commercial.png -qhp.QtCreator.extraFiles = images/commercial.png +HTML.extraimages = ../../config/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(qt-cpp-ignore.qdocconf) -include(qt-defines.qdocconf) +include(../../config/macros.qdocconf) +include(../../config/qt-cpp-ignore.qdocconf) +include(../../config/qt-defines.qdocconf) defines += qtcreator diff --git a/doc/config/style/qt5-sidebar.html b/doc/qtcreator/config/style/qt5-sidebar.html similarity index 100% rename from doc/config/style/qt5-sidebar.html rename to doc/qtcreator/config/style/qt5-sidebar.html diff --git a/doc/doxygen/Doxyfile b/doc/qtcreator/doxygen/Doxyfile similarity index 100% rename from doc/doxygen/Doxyfile rename to doc/qtcreator/doxygen/Doxyfile diff --git a/doc/examples/accelbubble/Bluebubble.svg b/doc/qtcreator/examples/accelbubble/Bluebubble.svg similarity index 100% rename from doc/examples/accelbubble/Bluebubble.svg rename to doc/qtcreator/examples/accelbubble/Bluebubble.svg diff --git a/doc/examples/accelbubble/Bubble.qml b/doc/qtcreator/examples/accelbubble/Bubble.qml similarity index 100% rename from doc/examples/accelbubble/Bubble.qml rename to doc/qtcreator/examples/accelbubble/Bubble.qml diff --git a/doc/examples/accelbubble/Page1Form.ui.qml b/doc/qtcreator/examples/accelbubble/Page1Form.ui.qml similarity index 100% rename from doc/examples/accelbubble/Page1Form.ui.qml rename to doc/qtcreator/examples/accelbubble/Page1Form.ui.qml diff --git a/doc/examples/accelbubble/Page2Form.ui.qml b/doc/qtcreator/examples/accelbubble/Page2Form.ui.qml similarity index 100% rename from doc/examples/accelbubble/Page2Form.ui.qml rename to doc/qtcreator/examples/accelbubble/Page2Form.ui.qml diff --git a/doc/examples/accelbubble/accelbubble.pro b/doc/qtcreator/examples/accelbubble/accelbubble.pro similarity index 100% rename from doc/examples/accelbubble/accelbubble.pro rename to doc/qtcreator/examples/accelbubble/accelbubble.pro diff --git a/doc/examples/accelbubble/main.cpp b/doc/qtcreator/examples/accelbubble/main.cpp similarity index 100% rename from doc/examples/accelbubble/main.cpp rename to doc/qtcreator/examples/accelbubble/main.cpp diff --git a/doc/examples/accelbubble/main.qml b/doc/qtcreator/examples/accelbubble/main.qml similarity index 100% rename from doc/examples/accelbubble/main.qml rename to doc/qtcreator/examples/accelbubble/main.qml diff --git a/doc/examples/accelbubble/qml.qrc b/doc/qtcreator/examples/accelbubble/qml.qrc similarity index 100% rename from doc/examples/accelbubble/qml.qrc rename to doc/qtcreator/examples/accelbubble/qml.qrc diff --git a/doc/examples/accelbubble/qtquickcontrols2.conf b/doc/qtcreator/examples/accelbubble/qtquickcontrols2.conf similarity index 100% rename from doc/examples/accelbubble/qtquickcontrols2.conf rename to doc/qtcreator/examples/accelbubble/qtquickcontrols2.conf diff --git a/doc/examples/progressbar/main.cpp b/doc/qtcreator/examples/progressbar/main.cpp similarity index 100% rename from doc/examples/progressbar/main.cpp rename to doc/qtcreator/examples/progressbar/main.cpp diff --git a/doc/examples/progressbar/progressbar.pro b/doc/qtcreator/examples/progressbar/progressbar.pro similarity index 100% rename from doc/examples/progressbar/progressbar.pro rename to doc/qtcreator/examples/progressbar/progressbar.pro diff --git a/doc/examples/progressbar/qml.qrc b/doc/qtcreator/examples/progressbar/qml.qrc similarity index 100% rename from doc/examples/progressbar/qml.qrc rename to doc/qtcreator/examples/progressbar/qml.qrc diff --git a/doc/examples/progressbar/qml/ProgressBar.qmlproject b/doc/qtcreator/examples/progressbar/qml/ProgressBar.qmlproject similarity index 100% rename from doc/examples/progressbar/qml/ProgressBar.qmlproject rename to doc/qtcreator/examples/progressbar/qml/ProgressBar.qmlproject diff --git a/doc/examples/progressbar/qml/ProgressBar.ui.qml b/doc/qtcreator/examples/progressbar/qml/ProgressBar.ui.qml similarity index 100% rename from doc/examples/progressbar/qml/ProgressBar.ui.qml rename to doc/qtcreator/examples/progressbar/qml/ProgressBar.ui.qml diff --git a/doc/examples/progressbar/qml/Root.qml b/doc/qtcreator/examples/progressbar/qml/Root.qml similarity index 100% rename from doc/examples/progressbar/qml/Root.qml rename to doc/qtcreator/examples/progressbar/qml/Root.qml diff --git a/doc/examples/progressbar/qml/built-with-Qt_Large.png b/doc/qtcreator/examples/progressbar/qml/built-with-Qt_Large.png similarity index 100% rename from doc/examples/progressbar/qml/built-with-Qt_Large.png rename to doc/qtcreator/examples/progressbar/qml/built-with-Qt_Large.png diff --git a/doc/examples/textfinder/input.txt b/doc/qtcreator/examples/textfinder/input.txt similarity index 100% rename from doc/examples/textfinder/input.txt rename to doc/qtcreator/examples/textfinder/input.txt diff --git a/doc/examples/textfinder/main.cpp b/doc/qtcreator/examples/textfinder/main.cpp similarity index 100% rename from doc/examples/textfinder/main.cpp rename to doc/qtcreator/examples/textfinder/main.cpp diff --git a/doc/examples/textfinder/textfinder.cpp b/doc/qtcreator/examples/textfinder/textfinder.cpp similarity index 100% rename from doc/examples/textfinder/textfinder.cpp rename to doc/qtcreator/examples/textfinder/textfinder.cpp diff --git a/doc/examples/textfinder/textfinder.h b/doc/qtcreator/examples/textfinder/textfinder.h similarity index 100% rename from doc/examples/textfinder/textfinder.h rename to doc/qtcreator/examples/textfinder/textfinder.h diff --git a/doc/examples/textfinder/textfinder.pro b/doc/qtcreator/examples/textfinder/textfinder.pro similarity index 100% rename from doc/examples/textfinder/textfinder.pro rename to doc/qtcreator/examples/textfinder/textfinder.pro diff --git a/doc/examples/textfinder/textfinder.qrc b/doc/qtcreator/examples/textfinder/textfinder.qrc similarity index 100% rename from doc/examples/textfinder/textfinder.qrc rename to doc/qtcreator/examples/textfinder/textfinder.qrc diff --git a/doc/examples/textfinder/textfinder.ui b/doc/qtcreator/examples/textfinder/textfinder.ui similarity index 100% rename from doc/examples/textfinder/textfinder.ui rename to doc/qtcreator/examples/textfinder/textfinder.ui diff --git a/doc/examples/transitions/Page1Form.ui.qml b/doc/qtcreator/examples/transitions/Page1Form.ui.qml similarity index 100% rename from doc/examples/transitions/Page1Form.ui.qml rename to doc/qtcreator/examples/transitions/Page1Form.ui.qml diff --git a/doc/examples/transitions/Page2Form.ui.qml b/doc/qtcreator/examples/transitions/Page2Form.ui.qml similarity index 100% rename from doc/examples/transitions/Page2Form.ui.qml rename to doc/qtcreator/examples/transitions/Page2Form.ui.qml diff --git a/doc/examples/transitions/main.cpp b/doc/qtcreator/examples/transitions/main.cpp similarity index 100% rename from doc/examples/transitions/main.cpp rename to doc/qtcreator/examples/transitions/main.cpp diff --git a/doc/examples/transitions/main.qml b/doc/qtcreator/examples/transitions/main.qml similarity index 100% rename from doc/examples/transitions/main.qml rename to doc/qtcreator/examples/transitions/main.qml diff --git a/doc/examples/transitions/qml.qrc b/doc/qtcreator/examples/transitions/qml.qrc similarity index 100% rename from doc/examples/transitions/qml.qrc rename to doc/qtcreator/examples/transitions/qml.qrc diff --git a/doc/examples/transitions/qt-logo.png b/doc/qtcreator/examples/transitions/qt-logo.png similarity index 100% rename from doc/examples/transitions/qt-logo.png rename to doc/qtcreator/examples/transitions/qt-logo.png diff --git a/doc/examples/transitions/qtquickcontrols2.conf b/doc/qtcreator/examples/transitions/qtquickcontrols2.conf similarity index 100% rename from doc/examples/transitions/qtquickcontrols2.conf rename to doc/qtcreator/examples/transitions/qtquickcontrols2.conf diff --git a/doc/examples/transitions/transitions.pro b/doc/qtcreator/examples/transitions/transitions.pro similarity index 100% rename from doc/examples/transitions/transitions.pro rename to doc/qtcreator/examples/transitions/transitions.pro diff --git a/doc/images/anchor-bottom.png b/doc/qtcreator/images/anchor-bottom.png similarity index 100% rename from doc/images/anchor-bottom.png rename to doc/qtcreator/images/anchor-bottom.png diff --git a/doc/images/anchor-fill.png b/doc/qtcreator/images/anchor-fill.png similarity index 100% rename from doc/images/anchor-fill.png rename to doc/qtcreator/images/anchor-fill.png diff --git a/doc/images/anchor-horizontal-center.png b/doc/qtcreator/images/anchor-horizontal-center.png similarity index 100% rename from doc/images/anchor-horizontal-center.png rename to doc/qtcreator/images/anchor-horizontal-center.png diff --git a/doc/images/anchor-left.png b/doc/qtcreator/images/anchor-left.png similarity index 100% rename from doc/images/anchor-left.png rename to doc/qtcreator/images/anchor-left.png diff --git a/doc/images/anchor-right.png b/doc/qtcreator/images/anchor-right.png similarity index 100% rename from doc/images/anchor-right.png rename to doc/qtcreator/images/anchor-right.png diff --git a/doc/images/anchor-top.png b/doc/qtcreator/images/anchor-top.png similarity index 100% rename from doc/images/anchor-top.png rename to doc/qtcreator/images/anchor-top.png diff --git a/doc/images/anchor-vertical-center.png b/doc/qtcreator/images/anchor-vertical-center.png similarity index 100% rename from doc/images/anchor-vertical-center.png rename to doc/qtcreator/images/anchor-vertical-center.png diff --git a/doc/images/beautifier_editor.png b/doc/qtcreator/images/beautifier_editor.png similarity index 100% rename from doc/images/beautifier_editor.png rename to doc/qtcreator/images/beautifier_editor.png diff --git a/doc/images/beautifier_options.png b/doc/qtcreator/images/beautifier_options.png similarity index 100% rename from doc/images/beautifier_options.png rename to doc/qtcreator/images/beautifier_options.png diff --git a/doc/images/completion/class.png b/doc/qtcreator/images/completion/class.png similarity index 100% rename from doc/images/completion/class.png rename to doc/qtcreator/images/completion/class.png diff --git a/doc/images/completion/element.png b/doc/qtcreator/images/completion/element.png similarity index 100% rename from doc/images/completion/element.png rename to doc/qtcreator/images/completion/element.png diff --git a/doc/images/completion/enum.png b/doc/qtcreator/images/completion/enum.png similarity index 100% rename from doc/images/completion/enum.png rename to doc/qtcreator/images/completion/enum.png diff --git a/doc/images/completion/enumerator.png b/doc/qtcreator/images/completion/enumerator.png similarity index 100% rename from doc/images/completion/enumerator.png rename to doc/qtcreator/images/completion/enumerator.png diff --git a/doc/images/completion/func.png b/doc/qtcreator/images/completion/func.png similarity index 100% rename from doc/images/completion/func.png rename to doc/qtcreator/images/completion/func.png diff --git a/doc/images/completion/func_priv.png b/doc/qtcreator/images/completion/func_priv.png similarity index 100% rename from doc/images/completion/func_priv.png rename to doc/qtcreator/images/completion/func_priv.png diff --git a/doc/images/completion/func_prot.png b/doc/qtcreator/images/completion/func_prot.png similarity index 100% rename from doc/images/completion/func_prot.png rename to doc/qtcreator/images/completion/func_prot.png diff --git a/doc/images/completion/keyword.png b/doc/qtcreator/images/completion/keyword.png similarity index 100% rename from doc/images/completion/keyword.png rename to doc/qtcreator/images/completion/keyword.png diff --git a/doc/images/completion/macro.png b/doc/qtcreator/images/completion/macro.png similarity index 100% rename from doc/images/completion/macro.png rename to doc/qtcreator/images/completion/macro.png diff --git a/doc/images/completion/namespace.png b/doc/qtcreator/images/completion/namespace.png similarity index 100% rename from doc/images/completion/namespace.png rename to doc/qtcreator/images/completion/namespace.png diff --git a/doc/images/completion/qmlsnippet.png b/doc/qtcreator/images/completion/qmlsnippet.png similarity index 100% rename from doc/images/completion/qmlsnippet.png rename to doc/qtcreator/images/completion/qmlsnippet.png diff --git a/doc/images/completion/signal.png b/doc/qtcreator/images/completion/signal.png similarity index 100% rename from doc/images/completion/signal.png rename to doc/qtcreator/images/completion/signal.png diff --git a/doc/images/completion/slot.png b/doc/qtcreator/images/completion/slot.png similarity index 100% rename from doc/images/completion/slot.png rename to doc/qtcreator/images/completion/slot.png diff --git a/doc/images/completion/slot_priv.png b/doc/qtcreator/images/completion/slot_priv.png similarity index 100% rename from doc/images/completion/slot_priv.png rename to doc/qtcreator/images/completion/slot_priv.png diff --git a/doc/images/completion/slot_prot.png b/doc/qtcreator/images/completion/slot_prot.png similarity index 100% rename from doc/images/completion/slot_prot.png rename to doc/qtcreator/images/completion/slot_prot.png diff --git a/doc/images/completion/snippet.png b/doc/qtcreator/images/completion/snippet.png similarity index 100% rename from doc/images/completion/snippet.png rename to doc/qtcreator/images/completion/snippet.png diff --git a/doc/images/completion/var.png b/doc/qtcreator/images/completion/var.png similarity index 100% rename from doc/images/completion/var.png rename to doc/qtcreator/images/completion/var.png diff --git a/doc/images/completion/var_priv.png b/doc/qtcreator/images/completion/var_priv.png similarity index 100% rename from doc/images/completion/var_priv.png rename to doc/qtcreator/images/completion/var_priv.png diff --git a/doc/images/completion/var_prot.png b/doc/qtcreator/images/completion/var_prot.png similarity index 100% rename from doc/images/completion/var_prot.png rename to doc/qtcreator/images/completion/var_prot.png diff --git a/doc/images/creator-baremetal-device.png b/doc/qtcreator/images/creator-baremetal-device.png similarity index 100% rename from doc/images/creator-baremetal-device.png rename to doc/qtcreator/images/creator-baremetal-device.png diff --git a/doc/images/creator-baremetal-kit-for-project.png b/doc/qtcreator/images/creator-baremetal-kit-for-project.png similarity index 100% rename from doc/images/creator-baremetal-kit-for-project.png rename to doc/qtcreator/images/creator-baremetal-kit-for-project.png diff --git a/doc/images/creator-baremetal-kits.png b/doc/qtcreator/images/creator-baremetal-kits.png similarity index 100% rename from doc/images/creator-baremetal-kits.png rename to doc/qtcreator/images/creator-baremetal-kits.png diff --git a/doc/images/creator-compilers-custom.png b/doc/qtcreator/images/creator-compilers-custom.png similarity index 100% rename from doc/images/creator-compilers-custom.png rename to doc/qtcreator/images/creator-compilers-custom.png diff --git a/doc/images/creator-diff-editor.png b/doc/qtcreator/images/creator-diff-editor.png similarity index 100% rename from doc/images/creator-diff-editor.png rename to doc/qtcreator/images/creator-diff-editor.png diff --git a/doc/images/creator-git-commit-actions.png b/doc/qtcreator/images/creator-git-commit-actions.png similarity index 100% rename from doc/images/creator-git-commit-actions.png rename to doc/qtcreator/images/creator-git-commit-actions.png diff --git a/doc/images/creator-gs-01.png b/doc/qtcreator/images/creator-gs-01.png similarity index 100% rename from doc/images/creator-gs-01.png rename to doc/qtcreator/images/creator-gs-01.png diff --git a/doc/images/creator-gs-02.png b/doc/qtcreator/images/creator-gs-02.png similarity index 100% rename from doc/images/creator-gs-02.png rename to doc/qtcreator/images/creator-gs-02.png diff --git a/doc/images/creator-gs-03.png b/doc/qtcreator/images/creator-gs-03.png similarity index 100% rename from doc/images/creator-gs-03.png rename to doc/qtcreator/images/creator-gs-03.png diff --git a/doc/images/creator-gs-04.png b/doc/qtcreator/images/creator-gs-04.png similarity index 100% rename from doc/images/creator-gs-04.png rename to doc/qtcreator/images/creator-gs-04.png diff --git a/doc/images/creator-qbs-build-app.png b/doc/qtcreator/images/creator-qbs-build-app.png similarity index 100% rename from doc/images/creator-qbs-build-app.png rename to doc/qtcreator/images/creator-qbs-build-app.png diff --git a/doc/images/creator-qbs-build-clean.png b/doc/qtcreator/images/creator-qbs-build-clean.png similarity index 100% rename from doc/images/creator-qbs-build-clean.png rename to doc/qtcreator/images/creator-qbs-build-clean.png diff --git a/doc/images/creator-qbs-project.png b/doc/qtcreator/images/creator-qbs-project.png similarity index 100% rename from doc/images/creator-qbs-project.png rename to doc/qtcreator/images/creator-qbs-project.png diff --git a/doc/images/creator-toggle-progress-bar.png b/doc/qtcreator/images/creator-toggle-progress-bar.png similarity index 100% rename from doc/images/creator-toggle-progress-bar.png rename to doc/qtcreator/images/creator-toggle-progress-bar.png diff --git a/doc/images/creator-uwp-kits.png b/doc/qtcreator/images/creator-uwp-kits.png similarity index 100% rename from doc/images/creator-uwp-kits.png rename to doc/qtcreator/images/creator-uwp-kits.png diff --git a/doc/images/creator_advanceduse.png b/doc/qtcreator/images/creator_advanceduse.png similarity index 100% rename from doc/images/creator_advanceduse.png rename to doc/qtcreator/images/creator_advanceduse.png diff --git a/doc/images/creator_android_tutorial_ex_app.png b/doc/qtcreator/images/creator_android_tutorial_ex_app.png similarity index 100% rename from doc/images/creator_android_tutorial_ex_app.png rename to doc/qtcreator/images/creator_android_tutorial_ex_app.png diff --git a/doc/images/creator_buildingrunning.png b/doc/qtcreator/images/creator_buildingrunning.png similarity index 100% rename from doc/images/creator_buildingrunning.png rename to doc/qtcreator/images/creator_buildingrunning.png diff --git a/doc/images/creator_coding.png b/doc/qtcreator/images/creator_coding.png similarity index 100% rename from doc/images/creator_coding.png rename to doc/qtcreator/images/creator_coding.png diff --git a/doc/images/creator_designinguserinterface.png b/doc/qtcreator/images/creator_designinguserinterface.png similarity index 100% rename from doc/images/creator_designinguserinterface.png rename to doc/qtcreator/images/creator_designinguserinterface.png diff --git a/doc/images/creator_gettinghelp.png b/doc/qtcreator/images/creator_gettinghelp.png similarity index 100% rename from doc/images/creator_gettinghelp.png rename to doc/qtcreator/images/creator_gettinghelp.png diff --git a/doc/images/creator_gettingstarted.png b/doc/qtcreator/images/creator_gettingstarted.png similarity index 100% rename from doc/images/creator_gettingstarted.png rename to doc/qtcreator/images/creator_gettingstarted.png diff --git a/doc/images/creator_managingprojects.png b/doc/qtcreator/images/creator_managingprojects.png similarity index 100% rename from doc/images/creator_managingprojects.png rename to doc/qtcreator/images/creator_managingprojects.png diff --git a/doc/images/creator_publishing.png b/doc/qtcreator/images/creator_publishing.png similarity index 100% rename from doc/images/creator_publishing.png rename to doc/qtcreator/images/creator_publishing.png diff --git a/doc/images/creator_testing.png b/doc/qtcreator/images/creator_testing.png similarity index 100% rename from doc/images/creator_testing.png rename to doc/qtcreator/images/creator_testing.png diff --git a/doc/images/icons/action-icon-binding.png b/doc/qtcreator/images/icons/action-icon-binding.png similarity index 100% rename from doc/images/icons/action-icon-binding.png rename to doc/qtcreator/images/icons/action-icon-binding.png diff --git a/doc/images/icons/action-icon.png b/doc/qtcreator/images/icons/action-icon.png similarity index 100% rename from doc/images/icons/action-icon.png rename to doc/qtcreator/images/icons/action-icon.png diff --git a/doc/images/icons/download-icon.png b/doc/qtcreator/images/icons/download-icon.png similarity index 100% rename from doc/images/icons/download-icon.png rename to doc/qtcreator/images/icons/download-icon.png diff --git a/doc/images/keyframe_linear_inactive.png b/doc/qtcreator/images/keyframe_linear_inactive.png similarity index 100% rename from doc/images/keyframe_linear_inactive.png rename to doc/qtcreator/images/keyframe_linear_inactive.png diff --git a/doc/images/keyframe_manualbezier_inactive.png b/doc/qtcreator/images/keyframe_manualbezier_inactive.png similarity index 100% rename from doc/images/keyframe_manualbezier_inactive.png rename to doc/qtcreator/images/keyframe_manualbezier_inactive.png diff --git a/doc/images/navigator.png b/doc/qtcreator/images/navigator.png similarity index 100% rename from doc/images/navigator.png rename to doc/qtcreator/images/navigator.png diff --git a/doc/images/numbers/01.png b/doc/qtcreator/images/numbers/01.png similarity index 100% rename from doc/images/numbers/01.png rename to doc/qtcreator/images/numbers/01.png diff --git a/doc/images/numbers/02.png b/doc/qtcreator/images/numbers/02.png similarity index 100% rename from doc/images/numbers/02.png rename to doc/qtcreator/images/numbers/02.png diff --git a/doc/images/numbers/03.png b/doc/qtcreator/images/numbers/03.png similarity index 100% rename from doc/images/numbers/03.png rename to doc/qtcreator/images/numbers/03.png diff --git a/doc/images/numbers/04.png b/doc/qtcreator/images/numbers/04.png similarity index 100% rename from doc/images/numbers/04.png rename to doc/qtcreator/images/numbers/04.png diff --git a/doc/images/numbers/05.png b/doc/qtcreator/images/numbers/05.png similarity index 100% rename from doc/images/numbers/05.png rename to doc/qtcreator/images/numbers/05.png diff --git a/doc/images/numbers/06.png b/doc/qtcreator/images/numbers/06.png similarity index 100% rename from doc/images/numbers/06.png rename to doc/qtcreator/images/numbers/06.png diff --git a/doc/images/numbers/07.png b/doc/qtcreator/images/numbers/07.png similarity index 100% rename from doc/images/numbers/07.png rename to doc/qtcreator/images/numbers/07.png diff --git a/doc/images/numbers/08.png b/doc/qtcreator/images/numbers/08.png similarity index 100% rename from doc/images/numbers/08.png rename to doc/qtcreator/images/numbers/08.png diff --git a/doc/images/numbers/09.png b/doc/qtcreator/images/numbers/09.png similarity index 100% rename from doc/images/numbers/09.png rename to doc/qtcreator/images/numbers/09.png diff --git a/doc/images/numbers/10.png b/doc/qtcreator/images/numbers/10.png similarity index 100% rename from doc/images/numbers/10.png rename to doc/qtcreator/images/numbers/10.png diff --git a/doc/images/ok.png b/doc/qtcreator/images/ok.png similarity index 100% rename from doc/images/ok.png rename to doc/qtcreator/images/ok.png diff --git a/doc/images/qml-code-completion.png b/doc/qtcreator/images/qml-code-completion.png similarity index 100% rename from doc/images/qml-code-completion.png rename to doc/qtcreator/images/qml-code-completion.png diff --git a/doc/images/qml-code-snippet.png b/doc/qtcreator/images/qml-code-snippet.png similarity index 100% rename from doc/images/qml-code-snippet.png rename to doc/qtcreator/images/qml-code-snippet.png diff --git a/doc/images/qml-export-gimp.png b/doc/qtcreator/images/qml-export-gimp.png similarity index 100% rename from doc/images/qml-export-gimp.png rename to doc/qtcreator/images/qml-export-gimp.png diff --git a/doc/images/qml-find-usages.png b/doc/qtcreator/images/qml-find-usages.png similarity index 100% rename from doc/images/qml-find-usages.png rename to doc/qtcreator/images/qml-find-usages.png diff --git a/doc/images/qml-link-debugging-library.png b/doc/qtcreator/images/qml-link-debugging-library.png similarity index 100% rename from doc/images/qml-link-debugging-library.png rename to doc/qtcreator/images/qml-link-debugging-library.png diff --git a/doc/images/qml-observer-context-menu.png b/doc/qtcreator/images/qml-observer-context-menu.png similarity index 100% rename from doc/images/qml-observer-context-menu.png rename to doc/qtcreator/images/qml-observer-context-menu.png diff --git a/doc/images/qml-observer-view.png b/doc/qtcreator/images/qml-observer-view.png similarity index 100% rename from doc/images/qml-observer-view.png rename to doc/qtcreator/images/qml-observer-view.png diff --git a/doc/images/qml-profiler-flamegraph.png b/doc/qtcreator/images/qml-profiler-flamegraph.png similarity index 100% rename from doc/images/qml-profiler-flamegraph.png rename to doc/qtcreator/images/qml-profiler-flamegraph.png diff --git a/doc/images/qml-profiler-settings.png b/doc/qtcreator/images/qml-profiler-settings.png similarity index 100% rename from doc/images/qml-profiler-settings.png rename to doc/qtcreator/images/qml-profiler-settings.png diff --git a/doc/images/qml-profiler-statistics.png b/doc/qtcreator/images/qml-profiler-statistics.png similarity index 100% rename from doc/images/qml-profiler-statistics.png rename to doc/qtcreator/images/qml-profiler-statistics.png diff --git a/doc/images/qml-rename-symbol.png b/doc/qtcreator/images/qml-rename-symbol.png similarity index 100% rename from doc/images/qml-rename-symbol.png rename to doc/qtcreator/images/qml-rename-symbol.png diff --git a/doc/images/qml-script-console.png b/doc/qtcreator/images/qml-script-console.png similarity index 100% rename from doc/images/qml-script-console.png rename to doc/qtcreator/images/qml-script-console.png diff --git a/doc/images/qml-snippet-editor.png b/doc/qtcreator/images/qml-snippet-editor.png similarity index 100% rename from doc/images/qml-snippet-editor.png rename to doc/qtcreator/images/qml-snippet-editor.png diff --git a/doc/images/qml-syntax-check.png b/doc/qtcreator/images/qml-syntax-check.png similarity index 100% rename from doc/images/qml-syntax-check.png rename to doc/qtcreator/images/qml-syntax-check.png diff --git a/doc/images/qml-toolbar-animation.png b/doc/qtcreator/images/qml-toolbar-animation.png similarity index 100% rename from doc/images/qml-toolbar-animation.png rename to doc/qtcreator/images/qml-toolbar-animation.png diff --git a/doc/images/qml-toolbar-image-preview.png b/doc/qtcreator/images/qml-toolbar-image-preview.png similarity index 100% rename from doc/images/qml-toolbar-image-preview.png rename to doc/qtcreator/images/qml-toolbar-image-preview.png diff --git a/doc/images/qml-toolbar-image.png b/doc/qtcreator/images/qml-toolbar-image.png similarity index 100% rename from doc/images/qml-toolbar-image.png rename to doc/qtcreator/images/qml-toolbar-image.png diff --git a/doc/images/qml-toolbar-pin.png b/doc/qtcreator/images/qml-toolbar-pin.png similarity index 100% rename from doc/images/qml-toolbar-pin.png rename to doc/qtcreator/images/qml-toolbar-pin.png diff --git a/doc/images/qml-toolbar-rectangle.png b/doc/qtcreator/images/qml-toolbar-rectangle.png similarity index 100% rename from doc/images/qml-toolbar-rectangle.png rename to doc/qtcreator/images/qml-toolbar-rectangle.png diff --git a/doc/images/qml-toolbar-text.png b/doc/qtcreator/images/qml-toolbar-text.png similarity index 100% rename from doc/images/qml-toolbar-text.png rename to doc/qtcreator/images/qml-toolbar-text.png diff --git a/doc/images/qml-translate.png b/doc/qtcreator/images/qml-translate.png similarity index 100% rename from doc/images/qml-translate.png rename to doc/qtcreator/images/qml-translate.png diff --git a/doc/images/qmldesigner-alignment.png b/doc/qtcreator/images/qmldesigner-alignment.png similarity index 100% rename from doc/images/qmldesigner-alignment.png rename to doc/qtcreator/images/qmldesigner-alignment.png diff --git a/doc/images/qmldesigner-anchor-buttons.png b/doc/qtcreator/images/qmldesigner-anchor-buttons.png similarity index 100% rename from doc/images/qmldesigner-anchor-buttons.png rename to doc/qtcreator/images/qmldesigner-anchor-buttons.png diff --git a/doc/images/qmldesigner-anchors.png b/doc/qtcreator/images/qmldesigner-anchors.png similarity index 100% rename from doc/images/qmldesigner-anchors.png rename to doc/qtcreator/images/qmldesigner-anchors.png diff --git a/doc/images/qmldesigner-backends.png b/doc/qtcreator/images/qmldesigner-backends.png similarity index 100% rename from doc/images/qmldesigner-backends.png rename to doc/qtcreator/images/qmldesigner-backends.png diff --git a/doc/images/qmldesigner-binding-editor.png b/doc/qtcreator/images/qmldesigner-binding-editor.png similarity index 100% rename from doc/images/qmldesigner-binding-editor.png rename to doc/qtcreator/images/qmldesigner-binding-editor.png diff --git a/doc/images/qmldesigner-bindings.png b/doc/qtcreator/images/qmldesigner-bindings.png similarity index 100% rename from doc/images/qmldesigner-bindings.png rename to doc/qtcreator/images/qmldesigner-bindings.png diff --git a/doc/images/qmldesigner-boolean-false-blue.png b/doc/qtcreator/images/qmldesigner-boolean-false-blue.png similarity index 100% rename from doc/images/qmldesigner-boolean-false-blue.png rename to doc/qtcreator/images/qmldesigner-boolean-false-blue.png diff --git a/doc/images/qmldesigner-boolean-false.png b/doc/qtcreator/images/qmldesigner-boolean-false.png similarity index 100% rename from doc/images/qmldesigner-boolean-false.png rename to doc/qtcreator/images/qmldesigner-boolean-false.png diff --git a/doc/images/qmldesigner-boolean-true-blue.png b/doc/qtcreator/images/qmldesigner-boolean-true-blue.png similarity index 100% rename from doc/images/qmldesigner-boolean-true-blue.png rename to doc/qtcreator/images/qmldesigner-boolean-true-blue.png diff --git a/doc/images/qmldesigner-boolean-true.png b/doc/qtcreator/images/qmldesigner-boolean-true.png similarity index 100% rename from doc/images/qmldesigner-boolean-true.png rename to doc/qtcreator/images/qmldesigner-boolean-true.png diff --git a/doc/images/qmldesigner-borderimage-bindings-text.png b/doc/qtcreator/images/qmldesigner-borderimage-bindings-text.png similarity index 100% rename from doc/images/qmldesigner-borderimage-bindings-text.png rename to doc/qtcreator/images/qmldesigner-borderimage-bindings-text.png diff --git a/doc/images/qmldesigner-borderimage-bindings.png b/doc/qtcreator/images/qmldesigner-borderimage-bindings.png similarity index 100% rename from doc/images/qmldesigner-borderimage-bindings.png rename to doc/qtcreator/images/qmldesigner-borderimage-bindings.png diff --git a/doc/images/qmldesigner-borderimage-connections.png b/doc/qtcreator/images/qmldesigner-borderimage-connections.png similarity index 100% rename from doc/images/qmldesigner-borderimage-connections.png rename to doc/qtcreator/images/qmldesigner-borderimage-connections.png diff --git a/doc/images/qmldesigner-borderimage-properties.png b/doc/qtcreator/images/qmldesigner-borderimage-properties.png similarity index 100% rename from doc/images/qmldesigner-borderimage-properties.png rename to doc/qtcreator/images/qmldesigner-borderimage-properties.png diff --git a/doc/images/qmldesigner-borderimage.png b/doc/qtcreator/images/qmldesigner-borderimage.png similarity index 100% rename from doc/images/qmldesigner-borderimage.png rename to doc/qtcreator/images/qmldesigner-borderimage.png diff --git a/doc/images/qmldesigner-breadcrumbs.png b/doc/qtcreator/images/qmldesigner-breadcrumbs.png similarity index 100% rename from doc/images/qmldesigner-breadcrumbs.png rename to doc/qtcreator/images/qmldesigner-breadcrumbs.png diff --git a/doc/images/qmldesigner-button.png b/doc/qtcreator/images/qmldesigner-button.png similarity index 100% rename from doc/images/qmldesigner-button.png rename to doc/qtcreator/images/qmldesigner-button.png diff --git a/doc/images/qmldesigner-code-completion.png b/doc/qtcreator/images/qmldesigner-code-completion.png similarity index 100% rename from doc/images/qmldesigner-code-completion.png rename to doc/qtcreator/images/qmldesigner-code-completion.png diff --git a/doc/images/qmldesigner-connections.png b/doc/qtcreator/images/qmldesigner-connections.png similarity index 100% rename from doc/images/qmldesigner-connections.png rename to doc/qtcreator/images/qmldesigner-connections.png diff --git a/doc/images/qmldesigner-distribute-objects.png b/doc/qtcreator/images/qmldesigner-distribute-objects.png similarity index 100% rename from doc/images/qmldesigner-distribute-objects.png rename to doc/qtcreator/images/qmldesigner-distribute-objects.png diff --git a/doc/images/qmldesigner-distribute-spacing-evenly.png b/doc/qtcreator/images/qmldesigner-distribute-spacing-evenly.png similarity index 100% rename from doc/images/qmldesigner-distribute-spacing-evenly.png rename to doc/qtcreator/images/qmldesigner-distribute-spacing-evenly.png diff --git a/doc/images/qmldesigner-distribute-spacing-pixels.png b/doc/qtcreator/images/qmldesigner-distribute-spacing-pixels.png similarity index 100% rename from doc/images/qmldesigner-distribute-spacing-pixels.png rename to doc/qtcreator/images/qmldesigner-distribute-spacing-pixels.png diff --git a/doc/images/qmldesigner-distribute-spacing-x.png b/doc/qtcreator/images/qmldesigner-distribute-spacing-x.png similarity index 100% rename from doc/images/qmldesigner-distribute-spacing-x.png rename to doc/qtcreator/images/qmldesigner-distribute-spacing-x.png diff --git a/doc/images/qmldesigner-dynamicprops.png b/doc/qtcreator/images/qmldesigner-dynamicprops.png similarity index 100% rename from doc/images/qmldesigner-dynamicprops.png rename to doc/qtcreator/images/qmldesigner-dynamicprops.png diff --git a/doc/images/qmldesigner-element-properties.png b/doc/qtcreator/images/qmldesigner-element-properties.png similarity index 100% rename from doc/images/qmldesigner-element-properties.png rename to doc/qtcreator/images/qmldesigner-element-properties.png diff --git a/doc/images/qmldesigner-element-size.png b/doc/qtcreator/images/qmldesigner-element-size.png similarity index 100% rename from doc/images/qmldesigner-element-size.png rename to doc/qtcreator/images/qmldesigner-element-size.png diff --git a/doc/images/qmldesigner-export-item.png b/doc/qtcreator/images/qmldesigner-export-item.png similarity index 100% rename from doc/images/qmldesigner-export-item.png rename to doc/qtcreator/images/qmldesigner-export-item.png diff --git a/doc/images/qmldesigner-extensions.png b/doc/qtcreator/images/qmldesigner-extensions.png similarity index 100% rename from doc/images/qmldesigner-extensions.png rename to doc/qtcreator/images/qmldesigner-extensions.png diff --git a/doc/images/qmldesigner-inline-editing.png b/doc/qtcreator/images/qmldesigner-inline-editing.png similarity index 100% rename from doc/images/qmldesigner-inline-editing.png rename to doc/qtcreator/images/qmldesigner-inline-editing.png diff --git a/doc/images/qmldesigner-navigator-arrows.png b/doc/qtcreator/images/qmldesigner-navigator-arrows.png similarity index 100% rename from doc/images/qmldesigner-navigator-arrows.png rename to doc/qtcreator/images/qmldesigner-navigator-arrows.png diff --git a/doc/images/qmldesigner-navigator.png b/doc/qtcreator/images/qmldesigner-navigator.png similarity index 100% rename from doc/images/qmldesigner-navigator.png rename to doc/qtcreator/images/qmldesigner-navigator.png diff --git a/doc/images/qmldesigner-new-project.png b/doc/qtcreator/images/qmldesigner-new-project.png similarity index 100% rename from doc/images/qmldesigner-new-project.png rename to doc/qtcreator/images/qmldesigner-new-project.png diff --git a/doc/images/qmldesigner-only-select-items-with-content.png b/doc/qtcreator/images/qmldesigner-only-select-items-with-content.png similarity index 100% rename from doc/images/qmldesigner-only-select-items-with-content.png rename to doc/qtcreator/images/qmldesigner-only-select-items-with-content.png diff --git a/doc/images/qmldesigner-pathview-editor.png b/doc/qtcreator/images/qmldesigner-pathview-editor.png similarity index 100% rename from doc/images/qmldesigner-pathview-editor.png rename to doc/qtcreator/images/qmldesigner-pathview-editor.png diff --git a/doc/images/qmldesigner-preview-size.png b/doc/qtcreator/images/qmldesigner-preview-size.png similarity index 100% rename from doc/images/qmldesigner-preview-size.png rename to doc/qtcreator/images/qmldesigner-preview-size.png diff --git a/doc/images/qmldesigner-properties-explicit-base.png b/doc/qtcreator/images/qmldesigner-properties-explicit-base.png similarity index 100% rename from doc/images/qmldesigner-properties-explicit-base.png rename to doc/qtcreator/images/qmldesigner-properties-explicit-base.png diff --git a/doc/images/qmldesigner-properties-explicit-state1.png b/doc/qtcreator/images/qmldesigner-properties-explicit-state1.png similarity index 100% rename from doc/images/qmldesigner-properties-explicit-state1.png rename to doc/qtcreator/images/qmldesigner-properties-explicit-state1.png diff --git a/doc/images/qmldesigner-qml-components.png b/doc/qtcreator/images/qmldesigner-qml-components.png similarity index 100% rename from doc/images/qmldesigner-qml-components.png rename to doc/qtcreator/images/qmldesigner-qml-components.png diff --git a/doc/images/qmldesigner-run-custom-exe.png b/doc/qtcreator/images/qmldesigner-run-custom-exe.png similarity index 100% rename from doc/images/qmldesigner-run-custom-exe.png rename to doc/qtcreator/images/qmldesigner-run-custom-exe.png diff --git a/doc/images/qmldesigner-run-settings.png b/doc/qtcreator/images/qmldesigner-run-settings.png similarity index 100% rename from doc/images/qmldesigner-run-settings.png rename to doc/qtcreator/images/qmldesigner-run-settings.png diff --git a/doc/images/qmldesigner-screen-design.png b/doc/qtcreator/images/qmldesigner-screen-design.png similarity index 100% rename from doc/images/qmldesigner-screen-design.png rename to doc/qtcreator/images/qmldesigner-screen-design.png diff --git a/doc/images/qmldesigner-set-expression.png b/doc/qtcreator/images/qmldesigner-set-expression.png similarity index 100% rename from doc/images/qmldesigner-set-expression.png rename to doc/qtcreator/images/qmldesigner-set-expression.png diff --git a/doc/images/qmldesigner-snap-margins.png b/doc/qtcreator/images/qmldesigner-snap-margins.png similarity index 100% rename from doc/images/qmldesigner-snap-margins.png rename to doc/qtcreator/images/qmldesigner-snap-margins.png diff --git a/doc/images/qmldesigner-states-when-condition.png b/doc/qtcreator/images/qmldesigner-states-when-condition.png similarity index 100% rename from doc/images/qmldesigner-states-when-condition.png rename to doc/qtcreator/images/qmldesigner-states-when-condition.png diff --git a/doc/images/qmldesigner-states.png b/doc/qtcreator/images/qmldesigner-states.png similarity index 100% rename from doc/images/qmldesigner-states.png rename to doc/qtcreator/images/qmldesigner-states.png diff --git a/doc/images/qmldesigner-text-property-tr.png b/doc/qtcreator/images/qmldesigner-text-property-tr.png similarity index 100% rename from doc/images/qmldesigner-text-property-tr.png rename to doc/qtcreator/images/qmldesigner-text-property-tr.png diff --git a/doc/images/qmldesigner-transitions.png b/doc/qtcreator/images/qmldesigner-transitions.png similarity index 100% rename from doc/images/qmldesigner-transitions.png rename to doc/qtcreator/images/qmldesigner-transitions.png diff --git a/doc/images/qmldesigner-tutorial-design-mode.png b/doc/qtcreator/images/qmldesigner-tutorial-design-mode.png similarity index 100% rename from doc/images/qmldesigner-tutorial-design-mode.png rename to doc/qtcreator/images/qmldesigner-tutorial-design-mode.png diff --git a/doc/images/qmldesigner-tutorial-quick-toolbar.png b/doc/qtcreator/images/qmldesigner-tutorial-quick-toolbar.png similarity index 100% rename from doc/images/qmldesigner-tutorial-quick-toolbar.png rename to doc/qtcreator/images/qmldesigner-tutorial-quick-toolbar.png diff --git a/doc/images/qmldesigner-tutorial-topleftrect-layout.png b/doc/qtcreator/images/qmldesigner-tutorial-topleftrect-layout.png similarity index 100% rename from doc/images/qmldesigner-tutorial-topleftrect-layout.png rename to doc/qtcreator/images/qmldesigner-tutorial-topleftrect-layout.png diff --git a/doc/images/qmldesigner-tutorial-topleftrect.png b/doc/qtcreator/images/qmldesigner-tutorial-topleftrect.png similarity index 100% rename from doc/images/qmldesigner-tutorial-topleftrect.png rename to doc/qtcreator/images/qmldesigner-tutorial-topleftrect.png diff --git a/doc/images/qmldesigner-tutorial-ui-ready.png b/doc/qtcreator/images/qmldesigner-tutorial-ui-ready.png similarity index 100% rename from doc/images/qmldesigner-tutorial-ui-ready.png rename to doc/qtcreator/images/qmldesigner-tutorial-ui-ready.png diff --git a/doc/images/qmldesigner-tutorial-user-icon.png b/doc/qtcreator/images/qmldesigner-tutorial-user-icon.png similarity index 100% rename from doc/images/qmldesigner-tutorial-user-icon.png rename to doc/qtcreator/images/qmldesigner-tutorial-user-icon.png diff --git a/doc/images/qmldesigner-tutorial.png b/doc/qtcreator/images/qmldesigner-tutorial.png similarity index 100% rename from doc/images/qmldesigner-tutorial.png rename to doc/qtcreator/images/qmldesigner-tutorial.png diff --git a/doc/images/qmldesigner-visual-editor.png b/doc/qtcreator/images/qmldesigner-visual-editor.png similarity index 100% rename from doc/images/qmldesigner-visual-editor.png rename to doc/qtcreator/images/qmldesigner-visual-editor.png diff --git a/doc/images/qt-creator-beautifier-options-general.png b/doc/qtcreator/images/qt-creator-beautifier-options-general.png similarity index 100% rename from doc/images/qt-creator-beautifier-options-general.png rename to doc/qtcreator/images/qt-creator-beautifier-options-general.png diff --git a/doc/images/qt-design-viewer.png b/doc/qtcreator/images/qt-design-viewer.png similarity index 100% rename from doc/images/qt-design-viewer.png rename to doc/qtcreator/images/qt-design-viewer.png diff --git a/doc/images/qtcreator-add-breakpoint.png b/doc/qtcreator/images/qtcreator-add-breakpoint.png similarity index 100% rename from doc/images/qtcreator-add-breakpoint.png rename to doc/qtcreator/images/qtcreator-add-breakpoint.png diff --git a/doc/images/qtcreator-add-library-wizard-ex-1.png b/doc/qtcreator/images/qtcreator-add-library-wizard-ex-1.png similarity index 100% rename from doc/images/qtcreator-add-library-wizard-ex-1.png rename to doc/qtcreator/images/qtcreator-add-library-wizard-ex-1.png diff --git a/doc/images/qtcreator-add-library-wizard.png b/doc/qtcreator/images/qtcreator-add-library-wizard.png similarity index 100% rename from doc/images/qtcreator-add-library-wizard.png rename to doc/qtcreator/images/qtcreator-add-library-wizard.png diff --git a/doc/images/qtcreator-add-online-doc.png b/doc/qtcreator/images/qtcreator-add-online-doc.png similarity index 100% rename from doc/images/qtcreator-add-online-doc.png rename to doc/qtcreator/images/qtcreator-add-online-doc.png diff --git a/doc/images/qtcreator-add-resource-wizard.png b/doc/qtcreator/images/qtcreator-add-resource-wizard.png similarity index 100% rename from doc/images/qtcreator-add-resource-wizard.png rename to doc/qtcreator/images/qtcreator-add-resource-wizard.png diff --git a/doc/images/qtcreator-add-resource-wizard2.png b/doc/qtcreator/images/qtcreator-add-resource-wizard2.png similarity index 100% rename from doc/images/qtcreator-add-resource-wizard2.png rename to doc/qtcreator/images/qtcreator-add-resource-wizard2.png diff --git a/doc/images/qtcreator-add-resource-wizard3.png b/doc/qtcreator/images/qtcreator-add-resource-wizard3.png similarity index 100% rename from doc/images/qtcreator-add-resource-wizard3.png rename to doc/qtcreator/images/qtcreator-add-resource-wizard3.png diff --git a/doc/images/qtcreator-add-resource.png b/doc/qtcreator/images/qtcreator-add-resource.png similarity index 100% rename from doc/images/qtcreator-add-resource.png rename to doc/qtcreator/images/qtcreator-add-resource.png diff --git a/doc/images/qtcreator-analyze-start-button.png b/doc/qtcreator/images/qtcreator-analyze-start-button.png similarity index 100% rename from doc/images/qtcreator-analyze-start-button.png rename to doc/qtcreator/images/qtcreator-analyze-start-button.png diff --git a/doc/images/qtcreator-analyzer-settings.png b/doc/qtcreator/images/qtcreator-analyzer-settings.png similarity index 100% rename from doc/images/qtcreator-analyzer-settings.png rename to doc/qtcreator/images/qtcreator-analyzer-settings.png diff --git a/doc/images/qtcreator-anchors-reset-icon.png b/doc/qtcreator/images/qtcreator-anchors-reset-icon.png similarity index 100% rename from doc/images/qtcreator-anchors-reset-icon.png rename to doc/qtcreator/images/qtcreator-anchors-reset-icon.png diff --git a/doc/images/qtcreator-android-build-steps.png b/doc/qtcreator/images/qtcreator-android-build-steps.png similarity index 100% rename from doc/images/qtcreator-android-build-steps.png rename to doc/qtcreator/images/qtcreator-android-build-steps.png diff --git a/doc/images/qtcreator-android-certificate.png b/doc/qtcreator/images/qtcreator-android-certificate.png similarity index 100% rename from doc/images/qtcreator-android-certificate.png rename to doc/qtcreator/images/qtcreator-android-certificate.png diff --git a/doc/images/qtcreator-android-cmake-settings.png b/doc/qtcreator/images/qtcreator-android-cmake-settings.png similarity index 100% rename from doc/images/qtcreator-android-cmake-settings.png rename to doc/qtcreator/images/qtcreator-android-cmake-settings.png diff --git a/doc/images/qtcreator-android-deploy-configurations.png b/doc/qtcreator/images/qtcreator-android-deploy-configurations.png similarity index 100% rename from doc/images/qtcreator-android-deploy-configurations.png rename to doc/qtcreator/images/qtcreator-android-deploy-configurations.png diff --git a/doc/images/qtcreator-android-manifest-editor.png b/doc/qtcreator/images/qtcreator-android-manifest-editor.png similarity index 100% rename from doc/images/qtcreator-android-manifest-editor.png rename to doc/qtcreator/images/qtcreator-android-manifest-editor.png diff --git a/doc/images/qtcreator-android-run-settings.png b/doc/qtcreator/images/qtcreator-android-run-settings.png similarity index 100% rename from doc/images/qtcreator-android-run-settings.png rename to doc/qtcreator/images/qtcreator-android-run-settings.png diff --git a/doc/images/qtcreator-android-sdk-manager.png b/doc/qtcreator/images/qtcreator-android-sdk-manager.png similarity index 100% rename from doc/images/qtcreator-android-sdk-manager.png rename to doc/qtcreator/images/qtcreator-android-sdk-manager.png diff --git a/doc/images/qtcreator-android-select-devices.png b/doc/qtcreator/images/qtcreator-android-select-devices.png similarity index 100% rename from doc/images/qtcreator-android-select-devices.png rename to doc/qtcreator/images/qtcreator-android-select-devices.png diff --git a/doc/images/qtcreator-application-output.png b/doc/qtcreator/images/qtcreator-application-output.png similarity index 100% rename from doc/images/qtcreator-application-output.png rename to doc/qtcreator/images/qtcreator-application-output.png diff --git a/doc/images/qtcreator-autotests-options-boost.png b/doc/qtcreator/images/qtcreator-autotests-options-boost.png similarity index 100% rename from doc/images/qtcreator-autotests-options-boost.png rename to doc/qtcreator/images/qtcreator-autotests-options-boost.png diff --git a/doc/images/qtcreator-autotests-options-google.png b/doc/qtcreator/images/qtcreator-autotests-options-google.png similarity index 100% rename from doc/images/qtcreator-autotests-options-google.png rename to doc/qtcreator/images/qtcreator-autotests-options-google.png diff --git a/doc/images/qtcreator-autotests-options-qt.png b/doc/qtcreator/images/qtcreator-autotests-options-qt.png similarity index 100% rename from doc/images/qtcreator-autotests-options-qt.png rename to doc/qtcreator/images/qtcreator-autotests-options-qt.png diff --git a/doc/images/qtcreator-autotests-options.png b/doc/qtcreator/images/qtcreator-autotests-options.png similarity index 100% rename from doc/images/qtcreator-autotests-options.png rename to doc/qtcreator/images/qtcreator-autotests-options.png diff --git a/doc/images/qtcreator-autotests.png b/doc/qtcreator/images/qtcreator-autotests.png similarity index 100% rename from doc/images/qtcreator-autotests.png rename to doc/qtcreator/images/qtcreator-autotests.png diff --git a/doc/images/qtcreator-autotools-buildrun.png b/doc/qtcreator/images/qtcreator-autotools-buildrun.png similarity index 100% rename from doc/images/qtcreator-autotools-buildrun.png rename to doc/qtcreator/images/qtcreator-autotools-buildrun.png diff --git a/doc/images/qtcreator-autotools-buildsettings.png b/doc/qtcreator/images/qtcreator-autotools-buildsettings.png similarity index 100% rename from doc/images/qtcreator-autotools-buildsettings.png rename to doc/qtcreator/images/qtcreator-autotools-buildsettings.png diff --git a/doc/images/qtcreator-blockhighlighting.png b/doc/qtcreator/images/qtcreator-blockhighlighting.png similarity index 100% rename from doc/images/qtcreator-blockhighlighting.png rename to doc/qtcreator/images/qtcreator-blockhighlighting.png diff --git a/doc/images/qtcreator-bookmarks-view.png b/doc/qtcreator/images/qtcreator-bookmarks-view.png similarity index 100% rename from doc/images/qtcreator-bookmarks-view.png rename to doc/qtcreator/images/qtcreator-bookmarks-view.png diff --git a/doc/images/qtcreator-breakdown.png b/doc/qtcreator/images/qtcreator-breakdown.png similarity index 100% rename from doc/images/qtcreator-breakdown.png rename to doc/qtcreator/images/qtcreator-breakdown.png diff --git a/doc/images/qtcreator-build-dependencies.png b/doc/qtcreator/images/qtcreator-build-dependencies.png similarity index 100% rename from doc/images/qtcreator-build-dependencies.png rename to doc/qtcreator/images/qtcreator-build-dependencies.png diff --git a/doc/images/qtcreator-build-environment.png b/doc/qtcreator/images/qtcreator-build-environment.png similarity index 100% rename from doc/images/qtcreator-build-environment.png rename to doc/qtcreator/images/qtcreator-build-environment.png diff --git a/doc/images/qtcreator-build-settings-ios.png b/doc/qtcreator/images/qtcreator-build-settings-ios.png similarity index 100% rename from doc/images/qtcreator-build-settings-ios.png rename to doc/qtcreator/images/qtcreator-build-settings-ios.png diff --git a/doc/images/qtcreator-build-steps-cmake-ninja.png b/doc/qtcreator/images/qtcreator-build-steps-cmake-ninja.png similarity index 100% rename from doc/images/qtcreator-build-steps-cmake-ninja.png rename to doc/qtcreator/images/qtcreator-build-steps-cmake-ninja.png diff --git a/doc/images/qtcreator-build-steps-custom.png b/doc/qtcreator/images/qtcreator-build-steps-custom.png similarity index 100% rename from doc/images/qtcreator-build-steps-custom.png rename to doc/qtcreator/images/qtcreator-build-steps-custom.png diff --git a/doc/images/qtcreator-build-steps.png b/doc/qtcreator/images/qtcreator-build-steps.png similarity index 100% rename from doc/images/qtcreator-build-steps.png rename to doc/qtcreator/images/qtcreator-build-steps.png diff --git a/doc/images/qtcreator-clang-code-model-build-settings.png b/doc/qtcreator/images/qtcreator-clang-code-model-build-settings.png similarity index 100% rename from doc/images/qtcreator-clang-code-model-build-settings.png rename to doc/qtcreator/images/qtcreator-clang-code-model-build-settings.png diff --git a/doc/images/qtcreator-clang-code-model-options.png b/doc/qtcreator/images/qtcreator-clang-code-model-options.png similarity index 100% rename from doc/images/qtcreator-clang-code-model-options.png rename to doc/qtcreator/images/qtcreator-clang-code-model-options.png diff --git a/doc/images/qtcreator-clang-format-options.png b/doc/qtcreator/images/qtcreator-clang-format-options.png similarity index 100% rename from doc/images/qtcreator-clang-format-options.png rename to doc/qtcreator/images/qtcreator-clang-format-options.png diff --git a/doc/images/qtcreator-clang-tidy.png b/doc/qtcreator/images/qtcreator-clang-tidy.png similarity index 100% rename from doc/images/qtcreator-clang-tidy.png rename to doc/qtcreator/images/qtcreator-clang-tidy.png diff --git a/doc/images/qtcreator-clang-tools-options.png b/doc/qtcreator/images/qtcreator-clang-tools-options.png similarity index 100% rename from doc/images/qtcreator-clang-tools-options.png rename to doc/qtcreator/images/qtcreator-clang-tools-options.png diff --git a/doc/images/qtcreator-clang-tools.png b/doc/qtcreator/images/qtcreator-clang-tools.png similarity index 100% rename from doc/images/qtcreator-clang-tools.png rename to doc/qtcreator/images/qtcreator-clang-tools.png diff --git a/doc/images/qtcreator-class-info-qt-gui.png b/doc/qtcreator/images/qtcreator-class-info-qt-gui.png similarity index 100% rename from doc/images/qtcreator-class-info-qt-gui.png rename to doc/qtcreator/images/qtcreator-class-info-qt-gui.png diff --git a/doc/images/qtcreator-clazy.png b/doc/qtcreator/images/qtcreator-clazy.png similarity index 100% rename from doc/images/qtcreator-clazy.png rename to doc/qtcreator/images/qtcreator-clazy.png diff --git a/doc/images/qtcreator-clean-steps.png b/doc/qtcreator/images/qtcreator-clean-steps.png similarity index 100% rename from doc/images/qtcreator-clean-steps.png rename to doc/qtcreator/images/qtcreator-clean-steps.png diff --git a/doc/images/qtcreator-cmake-build-settings.png b/doc/qtcreator/images/qtcreator-cmake-build-settings.png similarity index 100% rename from doc/images/qtcreator-cmake-build-settings.png rename to doc/qtcreator/images/qtcreator-cmake-build-settings.png diff --git a/doc/images/qtcreator-cmake-build-steps.png b/doc/qtcreator/images/qtcreator-cmake-build-steps.png similarity index 100% rename from doc/images/qtcreator-cmake-build-steps.png rename to doc/qtcreator/images/qtcreator-cmake-build-steps.png diff --git a/doc/images/qtcreator-cmake-clean-steps.png b/doc/qtcreator/images/qtcreator-cmake-clean-steps.png similarity index 100% rename from doc/images/qtcreator-cmake-clean-steps.png rename to doc/qtcreator/images/qtcreator-cmake-clean-steps.png diff --git a/doc/images/qtcreator-cmake-run-cmake.png b/doc/qtcreator/images/qtcreator-cmake-run-cmake.png similarity index 100% rename from doc/images/qtcreator-cmake-run-cmake.png rename to doc/qtcreator/images/qtcreator-cmake-run-cmake.png diff --git a/doc/images/qtcreator-cmake-run-settings.png b/doc/qtcreator/images/qtcreator-cmake-run-settings.png similarity index 100% rename from doc/images/qtcreator-cmake-run-settings.png rename to doc/qtcreator/images/qtcreator-cmake-run-settings.png diff --git a/doc/images/qtcreator-cmakeexecutable.png b/doc/qtcreator/images/qtcreator-cmakeexecutable.png similarity index 100% rename from doc/images/qtcreator-cmakeexecutable.png rename to doc/qtcreator/images/qtcreator-cmakeexecutable.png diff --git a/doc/images/qtcreator-code-pasting-options.png b/doc/qtcreator/images/qtcreator-code-pasting-options.png similarity index 100% rename from doc/images/qtcreator-code-pasting-options.png rename to doc/qtcreator/images/qtcreator-code-pasting-options.png diff --git a/doc/images/qtcreator-code-style-alignment.png b/doc/qtcreator/images/qtcreator-code-style-alignment.png similarity index 100% rename from doc/images/qtcreator-code-style-alignment.png rename to doc/qtcreator/images/qtcreator-code-style-alignment.png diff --git a/doc/images/qtcreator-code-style-braces.png b/doc/qtcreator/images/qtcreator-code-style-braces.png similarity index 100% rename from doc/images/qtcreator-code-style-braces.png rename to doc/qtcreator/images/qtcreator-code-style-braces.png diff --git a/doc/images/qtcreator-code-style-clang-format.png b/doc/qtcreator/images/qtcreator-code-style-clang-format.png similarity index 100% rename from doc/images/qtcreator-code-style-clang-format.png rename to doc/qtcreator/images/qtcreator-code-style-clang-format.png diff --git a/doc/images/qtcreator-code-style-content.png b/doc/qtcreator/images/qtcreator-code-style-content.png similarity index 100% rename from doc/images/qtcreator-code-style-content.png rename to doc/qtcreator/images/qtcreator-code-style-content.png diff --git a/doc/images/qtcreator-code-style-getter-setter.png b/doc/qtcreator/images/qtcreator-code-style-getter-setter.png similarity index 100% rename from doc/images/qtcreator-code-style-getter-setter.png rename to doc/qtcreator/images/qtcreator-code-style-getter-setter.png diff --git a/doc/images/qtcreator-code-style-settings-edit-cpp.png b/doc/qtcreator/images/qtcreator-code-style-settings-edit-cpp.png similarity index 100% rename from doc/images/qtcreator-code-style-settings-edit-cpp.png rename to doc/qtcreator/images/qtcreator-code-style-settings-edit-cpp.png diff --git a/doc/images/qtcreator-code-style-settings-edit-nim.png b/doc/qtcreator/images/qtcreator-code-style-settings-edit-nim.png similarity index 100% rename from doc/images/qtcreator-code-style-settings-edit-nim.png rename to doc/qtcreator/images/qtcreator-code-style-settings-edit-nim.png diff --git a/doc/images/qtcreator-code-style-settings-edit-qtquick.png b/doc/qtcreator/images/qtcreator-code-style-settings-edit-qtquick.png similarity index 100% rename from doc/images/qtcreator-code-style-settings-edit-qtquick.png rename to doc/qtcreator/images/qtcreator-code-style-settings-edit-qtquick.png diff --git a/doc/images/qtcreator-code-style-switch.png b/doc/qtcreator/images/qtcreator-code-style-switch.png similarity index 100% rename from doc/images/qtcreator-code-style-switch.png rename to doc/qtcreator/images/qtcreator-code-style-switch.png diff --git a/doc/images/qtcreator-codecompletion.png b/doc/qtcreator/images/qtcreator-codecompletion.png similarity index 100% rename from doc/images/qtcreator-codecompletion.png rename to doc/qtcreator/images/qtcreator-codecompletion.png diff --git a/doc/images/qtcreator-compile-output.png b/doc/qtcreator/images/qtcreator-compile-output.png similarity index 100% rename from doc/images/qtcreator-compile-output.png rename to doc/qtcreator/images/qtcreator-compile-output.png diff --git a/doc/images/qtcreator-context-menu.png b/doc/qtcreator/images/qtcreator-context-menu.png similarity index 100% rename from doc/images/qtcreator-context-menu.png rename to doc/qtcreator/images/qtcreator-context-menu.png diff --git a/doc/images/qtcreator-context-sensitive-help.png b/doc/qtcreator/images/qtcreator-context-sensitive-help.png similarity index 100% rename from doc/images/qtcreator-context-sensitive-help.png rename to doc/qtcreator/images/qtcreator-context-sensitive-help.png diff --git a/doc/images/qtcreator-cpp-class-wizard.png b/doc/qtcreator/images/qtcreator-cpp-class-wizard.png similarity index 100% rename from doc/images/qtcreator-cpp-class-wizard.png rename to doc/qtcreator/images/qtcreator-cpp-class-wizard.png diff --git a/doc/images/qtcreator-cppcheck-options.png b/doc/qtcreator/images/qtcreator-cppcheck-options.png similarity index 100% rename from doc/images/qtcreator-cppcheck-options.png rename to doc/qtcreator/images/qtcreator-cppcheck-options.png diff --git a/doc/images/qtcreator-cpu-usage-analyzer-load-perf-trace.png b/doc/qtcreator/images/qtcreator-cpu-usage-analyzer-load-perf-trace.png similarity index 100% rename from doc/images/qtcreator-cpu-usage-analyzer-load-perf-trace.png rename to doc/qtcreator/images/qtcreator-cpu-usage-analyzer-load-perf-trace.png diff --git a/doc/images/qtcreator-ctf-visualizer-statistics.png b/doc/qtcreator/images/qtcreator-ctf-visualizer-statistics.png similarity index 100% rename from doc/images/qtcreator-ctf-visualizer-statistics.png rename to doc/qtcreator/images/qtcreator-ctf-visualizer-statistics.png diff --git a/doc/images/qtcreator-ctf-visualizer-timeline.png b/doc/qtcreator/images/qtcreator-ctf-visualizer-timeline.png similarity index 100% rename from doc/images/qtcreator-ctf-visualizer-timeline.png rename to doc/qtcreator/images/qtcreator-ctf-visualizer-timeline.png diff --git a/doc/images/qtcreator-custom-parser.png b/doc/qtcreator/images/qtcreator-custom-parser.png similarity index 100% rename from doc/images/qtcreator-custom-parser.png rename to doc/qtcreator/images/qtcreator-custom-parser.png diff --git a/doc/images/qtcreator-custom-wizard.png b/doc/qtcreator/images/qtcreator-custom-wizard.png similarity index 100% rename from doc/images/qtcreator-custom-wizard.png rename to doc/qtcreator/images/qtcreator-custom-wizard.png diff --git a/doc/images/qtcreator-debug-breakpoints.png b/doc/qtcreator/images/qtcreator-debug-breakpoints.png similarity index 100% rename from doc/images/qtcreator-debug-breakpoints.png rename to doc/qtcreator/images/qtcreator-debug-breakpoints.png diff --git a/doc/images/qtcreator-debug-button-stop.png b/doc/qtcreator/images/qtcreator-debug-button-stop.png similarity index 100% rename from doc/images/qtcreator-debug-button-stop.png rename to doc/qtcreator/images/qtcreator-debug-button-stop.png diff --git a/doc/images/qtcreator-debug-button.png b/doc/qtcreator/images/qtcreator-debug-button.png similarity index 100% rename from doc/images/qtcreator-debug-button.png rename to doc/qtcreator/images/qtcreator-debug-button.png diff --git a/doc/images/qtcreator-debug-stack.png b/doc/qtcreator/images/qtcreator-debug-stack.png similarity index 100% rename from doc/images/qtcreator-debug-stack.png rename to doc/qtcreator/images/qtcreator-debug-stack.png diff --git a/doc/images/qtcreator-debugger-attach-to-process-not-yet-started.png b/doc/qtcreator/images/qtcreator-debugger-attach-to-process-not-yet-started.png similarity index 100% rename from doc/images/qtcreator-debugger-attach-to-process-not-yet-started.png rename to doc/qtcreator/images/qtcreator-debugger-attach-to-process-not-yet-started.png diff --git a/doc/images/qtcreator-debugger-attach-to-running-debug-server.png b/doc/qtcreator/images/qtcreator-debugger-attach-to-running-debug-server.png similarity index 100% rename from doc/images/qtcreator-debugger-attach-to-running-debug-server.png rename to doc/qtcreator/images/qtcreator-debugger-attach-to-running-debug-server.png diff --git a/doc/images/qtcreator-debugger-attach-to-running.png b/doc/qtcreator/images/qtcreator-debugger-attach-to-running.png similarity index 100% rename from doc/images/qtcreator-debugger-attach-to-running.png rename to doc/qtcreator/images/qtcreator-debugger-attach-to-running.png diff --git a/doc/images/qtcreator-debugger-breakpoint-preset.png b/doc/qtcreator/images/qtcreator-debugger-breakpoint-preset.png similarity index 100% rename from doc/images/qtcreator-debugger-breakpoint-preset.png rename to doc/qtcreator/images/qtcreator-debugger-breakpoint-preset.png diff --git a/doc/images/qtcreator-debugger-cdb-paths.png b/doc/qtcreator/images/qtcreator-debugger-cdb-paths.png similarity index 100% rename from doc/images/qtcreator-debugger-cdb-paths.png rename to doc/qtcreator/images/qtcreator-debugger-cdb-paths.png diff --git a/doc/images/qtcreator-debugger-expressions.png b/doc/qtcreator/images/qtcreator-debugger-expressions.png similarity index 100% rename from doc/images/qtcreator-debugger-expressions.png rename to doc/qtcreator/images/qtcreator-debugger-expressions.png diff --git a/doc/images/qtcreator-debugger-load-core-file.png b/doc/qtcreator/images/qtcreator-debugger-load-core-file.png similarity index 100% rename from doc/images/qtcreator-debugger-load-core-file.png rename to doc/qtcreator/images/qtcreator-debugger-load-core-file.png diff --git a/doc/images/qtcreator-debugger-start-external.png b/doc/qtcreator/images/qtcreator-debugger-start-external.png similarity index 100% rename from doc/images/qtcreator-debugger-start-external.png rename to doc/qtcreator/images/qtcreator-debugger-start-external.png diff --git a/doc/images/qtcreator-debugger-views.png b/doc/qtcreator/images/qtcreator-debugger-views.png similarity index 100% rename from doc/images/qtcreator-debugger-views.png rename to doc/qtcreator/images/qtcreator-debugger-views.png diff --git a/doc/images/qtcreator-debugging-continue.png b/doc/qtcreator/images/qtcreator-debugging-continue.png similarity index 100% rename from doc/images/qtcreator-debugging-continue.png rename to doc/qtcreator/images/qtcreator-debugging-continue.png diff --git a/doc/images/qtcreator-debugging-helper-options.png b/doc/qtcreator/images/qtcreator-debugging-helper-options.png similarity index 100% rename from doc/images/qtcreator-debugging-helper-options.png rename to doc/qtcreator/images/qtcreator-debugging-helper-options.png diff --git a/doc/images/qtcreator-deployment-steps-b2qt-58.png b/doc/qtcreator/images/qtcreator-deployment-steps-b2qt-58.png similarity index 100% rename from doc/images/qtcreator-deployment-steps-b2qt-58.png rename to doc/qtcreator/images/qtcreator-deployment-steps-b2qt-58.png diff --git a/doc/images/qtcreator-desktopdevice-button.png b/doc/qtcreator/images/qtcreator-desktopdevice-button.png similarity index 100% rename from doc/images/qtcreator-desktopdevice-button.png rename to doc/qtcreator/images/qtcreator-desktopdevice-button.png diff --git a/doc/images/qtcreator-diagnostics-configuration.png b/doc/qtcreator/images/qtcreator-diagnostics-configuration.png similarity index 100% rename from doc/images/qtcreator-diagnostics-configuration.png rename to doc/qtcreator/images/qtcreator-diagnostics-configuration.png diff --git a/doc/images/qtcreator-dialog.png b/doc/qtcreator/images/qtcreator-dialog.png similarity index 100% rename from doc/images/qtcreator-dialog.png rename to doc/qtcreator/images/qtcreator-dialog.png diff --git a/doc/images/qtcreator-edit-code-snippets.png b/doc/qtcreator/images/qtcreator-edit-code-snippets.png similarity index 100% rename from doc/images/qtcreator-edit-code-snippets.png rename to doc/qtcreator/images/qtcreator-edit-code-snippets.png diff --git a/doc/images/qtcreator-edit-mode.png b/doc/qtcreator/images/qtcreator-edit-mode.png similarity index 100% rename from doc/images/qtcreator-edit-mode.png rename to doc/qtcreator/images/qtcreator-edit-mode.png diff --git a/doc/images/qtcreator-editor-settings.png b/doc/qtcreator/images/qtcreator-editor-settings.png similarity index 100% rename from doc/images/qtcreator-editor-settings.png rename to doc/qtcreator/images/qtcreator-editor-settings.png diff --git a/doc/images/qtcreator-editortoolbar-symbols.png b/doc/qtcreator/images/qtcreator-editortoolbar-symbols.png similarity index 100% rename from doc/images/qtcreator-editortoolbar-symbols.png rename to doc/qtcreator/images/qtcreator-editortoolbar-symbols.png diff --git a/doc/images/qtcreator-embedded-linux-deployment-details.png b/doc/qtcreator/images/qtcreator-embedded-linux-deployment-details.png similarity index 100% rename from doc/images/qtcreator-embedded-linux-deployment-details.png rename to doc/qtcreator/images/qtcreator-embedded-linux-deployment-details.png diff --git a/doc/images/qtcreator-embedded-linux-deployment-overview.png b/doc/qtcreator/images/qtcreator-embedded-linux-deployment-overview.png similarity index 100% rename from doc/images/qtcreator-embedded-linux-deployment-overview.png rename to doc/qtcreator/images/qtcreator-embedded-linux-deployment-overview.png diff --git a/doc/images/qtcreator-error-message.png b/doc/qtcreator/images/qtcreator-error-message.png similarity index 100% rename from doc/images/qtcreator-error-message.png rename to doc/qtcreator/images/qtcreator-error-message.png diff --git a/doc/images/qtcreator-expand.png b/doc/qtcreator/images/qtcreator-expand.png similarity index 100% rename from doc/images/qtcreator-expand.png rename to doc/qtcreator/images/qtcreator-expand.png diff --git a/doc/images/qtcreator-external-tools.png b/doc/qtcreator/images/qtcreator-external-tools.png similarity index 100% rename from doc/images/qtcreator-external-tools.png rename to doc/qtcreator/images/qtcreator-external-tools.png diff --git a/doc/images/qtcreator-fakevim-options.png b/doc/qtcreator/images/qtcreator-fakevim-options.png similarity index 100% rename from doc/images/qtcreator-fakevim-options.png rename to doc/qtcreator/images/qtcreator-fakevim-options.png diff --git a/doc/images/qtcreator-files-to-analyze.png b/doc/qtcreator/images/qtcreator-files-to-analyze.png similarity index 100% rename from doc/images/qtcreator-files-to-analyze.png rename to doc/qtcreator/images/qtcreator-files-to-analyze.png diff --git a/doc/images/qtcreator-filesystem-view.png b/doc/qtcreator/images/qtcreator-filesystem-view.png similarity index 100% rename from doc/images/qtcreator-filesystem-view.png rename to doc/qtcreator/images/qtcreator-filesystem-view.png diff --git a/doc/images/qtcreator-font-colors.png b/doc/qtcreator/images/qtcreator-font-colors.png similarity index 100% rename from doc/images/qtcreator-font-colors.png rename to doc/qtcreator/images/qtcreator-font-colors.png diff --git a/doc/images/qtcreator-formedit.png b/doc/qtcreator/images/qtcreator-formedit.png similarity index 100% rename from doc/images/qtcreator-formedit.png rename to doc/qtcreator/images/qtcreator-formedit.png diff --git a/doc/images/qtcreator-general-messages.png b/doc/qtcreator/images/qtcreator-general-messages.png similarity index 100% rename from doc/images/qtcreator-general-messages.png rename to doc/qtcreator/images/qtcreator-general-messages.png diff --git a/doc/images/qtcreator-gerrit-options.png b/doc/qtcreator/images/qtcreator-gerrit-options.png similarity index 100% rename from doc/images/qtcreator-gerrit-options.png rename to doc/qtcreator/images/qtcreator-gerrit-options.png diff --git a/doc/images/qtcreator-gerrit-push.png b/doc/qtcreator/images/qtcreator-gerrit-push.png similarity index 100% rename from doc/images/qtcreator-gerrit-push.png rename to doc/qtcreator/images/qtcreator-gerrit-push.png diff --git a/doc/images/qtcreator-gerrit.png b/doc/qtcreator/images/qtcreator-gerrit.png similarity index 100% rename from doc/images/qtcreator-gerrit.png rename to doc/qtcreator/images/qtcreator-gerrit.png diff --git a/doc/images/qtcreator-git-commit-actions.png b/doc/qtcreator/images/qtcreator-git-commit-actions.png similarity index 100% rename from doc/images/qtcreator-git-commit-actions.png rename to doc/qtcreator/images/qtcreator-git-commit-actions.png diff --git a/doc/images/qtcreator-gs-build-example-kit-selector.png b/doc/qtcreator/images/qtcreator-gs-build-example-kit-selector.png similarity index 100% rename from doc/images/qtcreator-gs-build-example-kit-selector.png rename to doc/qtcreator/images/qtcreator-gs-build-example-kit-selector.png diff --git a/doc/images/qtcreator-gs-build-example-open.png b/doc/qtcreator/images/qtcreator-gs-build-example-open.png similarity index 100% rename from doc/images/qtcreator-gs-build-example-open.png rename to doc/qtcreator/images/qtcreator-gs-build-example-open.png diff --git a/doc/images/qtcreator-help-add-bookmark-dlg.png b/doc/qtcreator/images/qtcreator-help-add-bookmark-dlg.png similarity index 100% rename from doc/images/qtcreator-help-add-bookmark-dlg.png rename to doc/qtcreator/images/qtcreator-help-add-bookmark-dlg.png diff --git a/doc/images/qtcreator-help-filter-attributes.png b/doc/qtcreator/images/qtcreator-help-filter-attributes.png similarity index 100% rename from doc/images/qtcreator-help-filter-attributes.png rename to doc/qtcreator/images/qtcreator-help-filter-attributes.png diff --git a/doc/images/qtcreator-help-filters.png b/doc/qtcreator/images/qtcreator-help-filters.png similarity index 100% rename from doc/images/qtcreator-help-filters.png rename to doc/qtcreator/images/qtcreator-help-filters.png diff --git a/doc/images/qtcreator-help-options.png b/doc/qtcreator/images/qtcreator-help-options.png similarity index 100% rename from doc/images/qtcreator-help-options.png rename to doc/qtcreator/images/qtcreator-help-options.png diff --git a/doc/images/qtcreator-help-search.png b/doc/qtcreator/images/qtcreator-help-search.png similarity index 100% rename from doc/images/qtcreator-help-search.png rename to doc/qtcreator/images/qtcreator-help-search.png diff --git a/doc/images/qtcreator-heob-output.png b/doc/qtcreator/images/qtcreator-heob-output.png similarity index 100% rename from doc/images/qtcreator-heob-output.png rename to doc/qtcreator/images/qtcreator-heob-output.png diff --git a/doc/images/qtcreator-heob-settings.png b/doc/qtcreator/images/qtcreator-heob-settings.png similarity index 100% rename from doc/images/qtcreator-heob-settings.png rename to doc/qtcreator/images/qtcreator-heob-settings.png diff --git a/doc/images/qtcreator-heob.png b/doc/qtcreator/images/qtcreator-heob.png similarity index 100% rename from doc/images/qtcreator-heob.png rename to doc/qtcreator/images/qtcreator-heob.png diff --git a/doc/images/qtcreator-image-viewer.png b/doc/qtcreator/images/qtcreator-image-viewer.png similarity index 100% rename from doc/images/qtcreator-image-viewer.png rename to doc/qtcreator/images/qtcreator-image-viewer.png diff --git a/doc/images/qtcreator-indentation.png b/doc/qtcreator/images/qtcreator-indentation.png similarity index 100% rename from doc/images/qtcreator-indentation.png rename to doc/qtcreator/images/qtcreator-indentation.png diff --git a/doc/images/qtcreator-intro-and-location-qt-gui.png b/doc/qtcreator/images/qtcreator-intro-and-location-qt-gui.png similarity index 100% rename from doc/images/qtcreator-intro-and-location-qt-gui.png rename to doc/qtcreator/images/qtcreator-intro-and-location-qt-gui.png diff --git a/doc/images/qtcreator-ios-add-kit.png b/doc/qtcreator/images/qtcreator-ios-add-kit.png similarity index 100% rename from doc/images/qtcreator-ios-add-kit.png rename to doc/qtcreator/images/qtcreator-ios-add-kit.png diff --git a/doc/images/qtcreator-ios-device-configurations.png b/doc/qtcreator/images/qtcreator-ios-device-configurations.png similarity index 100% rename from doc/images/qtcreator-ios-device-configurations.png rename to doc/qtcreator/images/qtcreator-ios-device-configurations.png diff --git a/doc/images/qtcreator-ios-preferences.png b/doc/qtcreator/images/qtcreator-ios-preferences.png similarity index 100% rename from doc/images/qtcreator-ios-preferences.png rename to doc/qtcreator/images/qtcreator-ios-preferences.png diff --git a/doc/images/qtcreator-ios-simulator-deploy.png b/doc/qtcreator/images/qtcreator-ios-simulator-deploy.png similarity index 100% rename from doc/images/qtcreator-ios-simulator-deploy.png rename to doc/qtcreator/images/qtcreator-ios-simulator-deploy.png diff --git a/doc/images/qtcreator-iso-icon-browser.png b/doc/qtcreator/images/qtcreator-iso-icon-browser.png similarity index 100% rename from doc/images/qtcreator-iso-icon-browser.png rename to doc/qtcreator/images/qtcreator-iso-icon-browser.png diff --git a/doc/images/qtcreator-issues.png b/doc/qtcreator/images/qtcreator-issues.png similarity index 100% rename from doc/images/qtcreator-issues.png rename to doc/qtcreator/images/qtcreator-issues.png diff --git a/doc/images/qtcreator-keyboard-shortcuts.png b/doc/qtcreator/images/qtcreator-keyboard-shortcuts.png similarity index 100% rename from doc/images/qtcreator-keyboard-shortcuts.png rename to doc/qtcreator/images/qtcreator-keyboard-shortcuts.png diff --git a/doc/qtcreator/images/qtcreator-kit-nimble.png b/doc/qtcreator/images/qtcreator-kit-nimble.png new file mode 100644 index 00000000000..fd21928ef99 Binary files /dev/null and b/doc/qtcreator/images/qtcreator-kit-nimble.png differ diff --git a/doc/images/qtcreator-kit-selector.png b/doc/qtcreator/images/qtcreator-kit-selector.png similarity index 100% rename from doc/images/qtcreator-kit-selector.png rename to doc/qtcreator/images/qtcreator-kit-selector.png diff --git a/doc/images/qtcreator-kit-webassembly.png b/doc/qtcreator/images/qtcreator-kit-webassembly.png similarity index 100% rename from doc/images/qtcreator-kit-webassembly.png rename to doc/qtcreator/images/qtcreator-kit-webassembly.png diff --git a/doc/images/qtcreator-kits.png b/doc/qtcreator/images/qtcreator-kits.png similarity index 100% rename from doc/images/qtcreator-kits.png rename to doc/qtcreator/images/qtcreator-kits.png diff --git a/doc/images/qtcreator-language-client-options.png b/doc/qtcreator/images/qtcreator-language-client-options.png similarity index 100% rename from doc/images/qtcreator-language-client-options.png rename to doc/qtcreator/images/qtcreator-language-client-options.png diff --git a/doc/images/qtcreator-linux-device-configurations.png b/doc/qtcreator/images/qtcreator-linux-device-configurations.png similarity index 100% rename from doc/images/qtcreator-linux-device-configurations.png rename to doc/qtcreator/images/qtcreator-linux-device-configurations.png diff --git a/doc/images/qtcreator-live-preview-kit.png b/doc/qtcreator/images/qtcreator-live-preview-kit.png similarity index 100% rename from doc/images/qtcreator-live-preview-kit.png rename to doc/qtcreator/images/qtcreator-live-preview-kit.png diff --git a/doc/images/qtcreator-live-preview.png b/doc/qtcreator/images/qtcreator-live-preview.png similarity index 100% rename from doc/images/qtcreator-live-preview.png rename to doc/qtcreator/images/qtcreator-live-preview.png diff --git a/doc/images/qtcreator-locals.png b/doc/qtcreator/images/qtcreator-locals.png similarity index 100% rename from doc/images/qtcreator-locals.png rename to doc/qtcreator/images/qtcreator-locals.png diff --git a/doc/images/qtcreator-locator-bookmark-filtering.png b/doc/qtcreator/images/qtcreator-locator-bookmark-filtering.png similarity index 100% rename from doc/images/qtcreator-locator-bookmark-filtering.png rename to doc/qtcreator/images/qtcreator-locator-bookmark-filtering.png diff --git a/doc/images/qtcreator-locator-customize.png b/doc/qtcreator/images/qtcreator-locator-customize.png similarity index 100% rename from doc/images/qtcreator-locator-customize.png rename to doc/qtcreator/images/qtcreator-locator-customize.png diff --git a/doc/images/qtcreator-locator-open.png b/doc/qtcreator/images/qtcreator-locator-open.png similarity index 100% rename from doc/images/qtcreator-locator-open.png rename to doc/qtcreator/images/qtcreator-locator-open.png diff --git a/doc/images/qtcreator-locator.png b/doc/qtcreator/images/qtcreator-locator.png similarity index 100% rename from doc/images/qtcreator-locator.png rename to doc/qtcreator/images/qtcreator-locator.png diff --git a/doc/images/qtcreator-mcu-device.png b/doc/qtcreator/images/qtcreator-mcu-device.png similarity index 100% rename from doc/images/qtcreator-mcu-device.png rename to doc/qtcreator/images/qtcreator-mcu-device.png diff --git a/doc/images/qtcreator-mcu-kit.png b/doc/qtcreator/images/qtcreator-mcu-kit.png similarity index 100% rename from doc/images/qtcreator-mcu-kit.png rename to doc/qtcreator/images/qtcreator-mcu-kit.png diff --git a/doc/images/qtcreator-mcu-options.png b/doc/qtcreator/images/qtcreator-mcu-options.png similarity index 100% rename from doc/images/qtcreator-mcu-options.png rename to doc/qtcreator/images/qtcreator-mcu-options.png diff --git a/doc/images/qtcreator-menu-item.png b/doc/qtcreator/images/qtcreator-menu-item.png similarity index 100% rename from doc/images/qtcreator-menu-item.png rename to doc/qtcreator/images/qtcreator-menu-item.png diff --git a/doc/images/qtcreator-menu.png b/doc/qtcreator/images/qtcreator-menu.png similarity index 100% rename from doc/images/qtcreator-menu.png rename to doc/qtcreator/images/qtcreator-menu.png diff --git a/doc/images/qtcreator-mime-types-magic-header.png b/doc/qtcreator/images/qtcreator-mime-types-magic-header.png similarity index 100% rename from doc/images/qtcreator-mime-types-magic-header.png rename to doc/qtcreator/images/qtcreator-mime-types-magic-header.png diff --git a/doc/images/qtcreator-mime-types.png b/doc/qtcreator/images/qtcreator-mime-types.png similarity index 100% rename from doc/images/qtcreator-mime-types.png rename to doc/qtcreator/images/qtcreator-mime-types.png diff --git a/doc/images/qtcreator-mode-selector.png b/doc/qtcreator/images/qtcreator-mode-selector.png similarity index 100% rename from doc/images/qtcreator-mode-selector.png rename to doc/qtcreator/images/qtcreator-mode-selector.png diff --git a/doc/images/qtcreator-modeleditor-classes.png b/doc/qtcreator/images/qtcreator-modeleditor-classes.png similarity index 100% rename from doc/images/qtcreator-modeleditor-classes.png rename to doc/qtcreator/images/qtcreator-modeleditor-classes.png diff --git a/doc/images/qtcreator-modeleditor-packages.png b/doc/qtcreator/images/qtcreator-modeleditor-packages.png similarity index 100% rename from doc/images/qtcreator-modeleditor-packages.png rename to doc/qtcreator/images/qtcreator-modeleditor-packages.png diff --git a/doc/images/qtcreator-modeleditor.png b/doc/qtcreator/images/qtcreator-modeleditor.png similarity index 100% rename from doc/images/qtcreator-modeleditor.png rename to doc/qtcreator/images/qtcreator-modeleditor.png diff --git a/doc/images/qtcreator-move-component-into-separate-file.png b/doc/qtcreator/images/qtcreator-move-component-into-separate-file.png similarity index 100% rename from doc/images/qtcreator-move-component-into-separate-file.png rename to doc/qtcreator/images/qtcreator-move-component-into-separate-file.png diff --git a/doc/images/qtcreator-navigate-customfilter.png b/doc/qtcreator/images/qtcreator-navigate-customfilter.png similarity index 100% rename from doc/images/qtcreator-navigate-customfilter.png rename to doc/qtcreator/images/qtcreator-navigate-customfilter.png diff --git a/doc/images/qtcreator-navigate-popup.png b/doc/qtcreator/images/qtcreator-navigate-popup.png similarity index 100% rename from doc/images/qtcreator-navigate-popup.png rename to doc/qtcreator/images/qtcreator-navigate-popup.png diff --git a/doc/images/qtcreator-new-opengl-file.png b/doc/qtcreator/images/qtcreator-new-opengl-file.png similarity index 100% rename from doc/images/qtcreator-new-opengl-file.png rename to doc/qtcreator/images/qtcreator-new-opengl-file.png diff --git a/doc/images/qtcreator-new-project-qt-versions-qt-gui.png b/doc/qtcreator/images/qtcreator-new-project-qt-versions-qt-gui.png similarity index 100% rename from doc/images/qtcreator-new-project-qt-versions-qt-gui.png rename to doc/qtcreator/images/qtcreator-new-project-qt-versions-qt-gui.png diff --git a/doc/images/qtcreator-new-project-summary-qt-gui.png b/doc/qtcreator/images/qtcreator-new-project-summary-qt-gui.png similarity index 100% rename from doc/images/qtcreator-new-project-summary-qt-gui.png rename to doc/qtcreator/images/qtcreator-new-project-summary-qt-gui.png diff --git a/doc/images/qtcreator-new-qt-gui-application.png b/doc/qtcreator/images/qtcreator-new-qt-gui-application.png similarity index 100% rename from doc/images/qtcreator-new-qt-gui-application.png rename to doc/qtcreator/images/qtcreator-new-qt-gui-application.png diff --git a/doc/images/qtcreator-new-qt-quick-project-wizard.png b/doc/qtcreator/images/qtcreator-new-qt-quick-project-wizard.png similarity index 100% rename from doc/images/qtcreator-new-qt-quick-project-wizard.png rename to doc/qtcreator/images/qtcreator-new-qt-quick-project-wizard.png diff --git a/doc/images/qtcreator-new-search-icon.png b/doc/qtcreator/images/qtcreator-new-search-icon.png similarity index 100% rename from doc/images/qtcreator-new-search-icon.png rename to doc/qtcreator/images/qtcreator-new-search-icon.png diff --git a/doc/images/qtcreator-new-subproject.png b/doc/qtcreator/images/qtcreator-new-subproject.png similarity index 100% rename from doc/images/qtcreator-new-subproject.png rename to doc/qtcreator/images/qtcreator-new-subproject.png diff --git a/doc/images/qtcreator-open-project-kits.png b/doc/qtcreator/images/qtcreator-open-project-kits.png similarity index 100% rename from doc/images/qtcreator-open-project-kits.png rename to doc/qtcreator/images/qtcreator-open-project-kits.png diff --git a/doc/images/qtcreator-options-android1.png b/doc/qtcreator/images/qtcreator-options-android1.png similarity index 100% rename from doc/images/qtcreator-options-android1.png rename to doc/qtcreator/images/qtcreator-options-android1.png diff --git a/doc/images/qtcreator-options-android2.png b/doc/qtcreator/images/qtcreator-options-android2.png similarity index 100% rename from doc/images/qtcreator-options-android2.png rename to doc/qtcreator/images/qtcreator-options-android2.png diff --git a/doc/images/qtcreator-options-build-run-debuggers.png b/doc/qtcreator/images/qtcreator-options-build-run-debuggers.png similarity index 100% rename from doc/images/qtcreator-options-build-run-debuggers.png rename to doc/qtcreator/images/qtcreator-options-build-run-debuggers.png diff --git a/doc/images/qtcreator-options-code-style-cpp.png b/doc/qtcreator/images/qtcreator-options-code-style-cpp.png similarity index 100% rename from doc/images/qtcreator-options-code-style-cpp.png rename to doc/qtcreator/images/qtcreator-options-code-style-cpp.png diff --git a/doc/images/qtcreator-options-code-style-nim.png b/doc/qtcreator/images/qtcreator-options-code-style-nim.png similarity index 100% rename from doc/images/qtcreator-options-code-style-nim.png rename to doc/qtcreator/images/qtcreator-options-code-style-nim.png diff --git a/doc/images/qtcreator-options-code-style-qml.png b/doc/qtcreator/images/qtcreator-options-code-style-qml.png similarity index 100% rename from doc/images/qtcreator-options-code-style-qml.png rename to doc/qtcreator/images/qtcreator-options-code-style-qml.png diff --git a/doc/images/qtcreator-options-cpp-files.png b/doc/qtcreator/images/qtcreator-options-cpp-files.png similarity index 100% rename from doc/images/qtcreator-options-cpp-files.png rename to doc/qtcreator/images/qtcreator-options-cpp-files.png diff --git a/doc/images/qtcreator-options-environment-interface.png b/doc/qtcreator/images/qtcreator-options-environment-interface.png similarity index 100% rename from doc/images/qtcreator-options-environment-interface.png rename to doc/qtcreator/images/qtcreator-options-environment-interface.png diff --git a/doc/images/qtcreator-options-environment-system.png b/doc/qtcreator/images/qtcreator-options-environment-system.png similarity index 100% rename from doc/images/qtcreator-options-environment-system.png rename to doc/qtcreator/images/qtcreator-options-environment-system.png diff --git a/doc/images/qtcreator-options-qbs.png b/doc/qtcreator/images/qtcreator-options-qbs.png similarity index 100% rename from doc/images/qtcreator-options-qbs.png rename to doc/qtcreator/images/qtcreator-options-qbs.png diff --git a/doc/images/qtcreator-output-pane.png b/doc/qtcreator/images/qtcreator-output-pane.png similarity index 100% rename from doc/images/qtcreator-output-pane.png rename to doc/qtcreator/images/qtcreator-output-pane.png diff --git a/doc/images/qtcreator-parse-build-output.png b/doc/qtcreator/images/qtcreator-parse-build-output.png similarity index 100% rename from doc/images/qtcreator-parse-build-output.png rename to doc/qtcreator/images/qtcreator-parse-build-output.png diff --git a/doc/images/qtcreator-performance-analyzer-flamegraph.png b/doc/qtcreator/images/qtcreator-performance-analyzer-flamegraph.png similarity index 100% rename from doc/images/qtcreator-performance-analyzer-flamegraph.png rename to doc/qtcreator/images/qtcreator-performance-analyzer-flamegraph.png diff --git a/doc/images/qtcreator-performance-analyzer-settings.png b/doc/qtcreator/images/qtcreator-performance-analyzer-settings.png similarity index 100% rename from doc/images/qtcreator-performance-analyzer-settings.png rename to doc/qtcreator/images/qtcreator-performance-analyzer-settings.png diff --git a/doc/images/qtcreator-performance-analyzer-statistics.png b/doc/qtcreator/images/qtcreator-performance-analyzer-statistics.png similarity index 100% rename from doc/images/qtcreator-performance-analyzer-statistics.png rename to doc/qtcreator/images/qtcreator-performance-analyzer-statistics.png diff --git a/doc/images/qtcreator-performance-analyzer-timeline.png b/doc/qtcreator/images/qtcreator-performance-analyzer-timeline.png similarity index 100% rename from doc/images/qtcreator-performance-analyzer-timeline.png rename to doc/qtcreator/images/qtcreator-performance-analyzer-timeline.png diff --git a/doc/images/qtcreator-pin-tooltip.png b/doc/qtcreator/images/qtcreator-pin-tooltip.png similarity index 100% rename from doc/images/qtcreator-pin-tooltip.png rename to doc/qtcreator/images/qtcreator-pin-tooltip.png diff --git a/doc/images/qtcreator-pointers-references.png b/doc/qtcreator/images/qtcreator-pointers-references.png similarity index 100% rename from doc/images/qtcreator-pointers-references.png rename to doc/qtcreator/images/qtcreator-pointers-references.png diff --git a/doc/images/qtcreator-pprunsettings.png b/doc/qtcreator/images/qtcreator-pprunsettings.png similarity index 100% rename from doc/images/qtcreator-pprunsettings.png rename to doc/qtcreator/images/qtcreator-pprunsettings.png diff --git a/doc/images/qtcreator-project-kits.png b/doc/qtcreator/images/qtcreator-project-kits.png similarity index 100% rename from doc/images/qtcreator-project-kits.png rename to doc/qtcreator/images/qtcreator-project-kits.png diff --git a/doc/qtcreator/images/qtcreator-project-nimble.png b/doc/qtcreator/images/qtcreator-project-nimble.png new file mode 100644 index 00000000000..ae928bebc2a Binary files /dev/null and b/doc/qtcreator/images/qtcreator-project-nimble.png differ diff --git a/doc/images/qtcreator-project-options-deploy.png b/doc/qtcreator/images/qtcreator-project-options-deploy.png similarity index 100% rename from doc/images/qtcreator-project-options-deploy.png rename to doc/qtcreator/images/qtcreator-project-options-deploy.png diff --git a/doc/images/qtcreator-projectpane.png b/doc/qtcreator/images/qtcreator-projectpane.png similarity index 100% rename from doc/images/qtcreator-projectpane.png rename to doc/qtcreator/images/qtcreator-projectpane.png diff --git a/doc/images/qtcreator-projects-code-style.png b/doc/qtcreator/images/qtcreator-projects-code-style.png similarity index 100% rename from doc/images/qtcreator-projects-code-style.png rename to doc/qtcreator/images/qtcreator-projects-code-style.png diff --git a/doc/images/qtcreator-python-run-settings-custom-executable.png b/doc/qtcreator/images/qtcreator-python-run-settings-custom-executable.png similarity index 100% rename from doc/images/qtcreator-python-run-settings-custom-executable.png rename to doc/qtcreator/images/qtcreator-python-run-settings-custom-executable.png diff --git a/doc/images/qtcreator-python-run-settings.png b/doc/qtcreator/images/qtcreator-python-run-settings.png similarity index 100% rename from doc/images/qtcreator-python-run-settings.png rename to doc/qtcreator/images/qtcreator-python-run-settings.png diff --git a/doc/images/qtcreator-python-wizard-app-window.png b/doc/qtcreator/images/qtcreator-python-wizard-app-window.png similarity index 100% rename from doc/images/qtcreator-python-wizard-app-window.png rename to doc/qtcreator/images/qtcreator-python-wizard-app-window.png diff --git a/doc/qtcreator/images/qtcreator-python-wizard-qml.png b/doc/qtcreator/images/qtcreator-python-wizard-qml.png new file mode 100644 index 00000000000..d8d3aeb929f Binary files /dev/null and b/doc/qtcreator/images/qtcreator-python-wizard-qml.png differ diff --git a/doc/images/qtcreator-qbs-profile-settings.png b/doc/qtcreator/images/qtcreator-qbs-profile-settings.png similarity index 100% rename from doc/images/qtcreator-qbs-profile-settings.png rename to doc/qtcreator/images/qtcreator-qbs-profile-settings.png diff --git a/doc/images/qtcreator-qml-performance-monitor.png b/doc/qtcreator/images/qtcreator-qml-performance-monitor.png similarity index 100% rename from doc/images/qtcreator-qml-performance-monitor.png rename to doc/qtcreator/images/qtcreator-qml-performance-monitor.png diff --git a/doc/images/qtcreator-qnx-deployment.png b/doc/qtcreator/images/qtcreator-qnx-deployment.png similarity index 100% rename from doc/images/qtcreator-qnx-deployment.png rename to doc/qtcreator/images/qtcreator-qnx-deployment.png diff --git a/doc/images/qtcreator-qt-quick-editors.png b/doc/qtcreator/images/qtcreator-qt-quick-editors.png similarity index 100% rename from doc/images/qtcreator-qt-quick-editors.png rename to doc/qtcreator/images/qtcreator-qt-quick-editors.png diff --git a/doc/images/qtcreator-qt4-qtversions-add.png b/doc/qtcreator/images/qtcreator-qt4-qtversions-add.png similarity index 100% rename from doc/images/qtcreator-qt4-qtversions-add.png rename to doc/qtcreator/images/qtcreator-qt4-qtversions-add.png diff --git a/doc/images/qtcreator-refactoring-find.png b/doc/qtcreator/images/qtcreator-refactoring-find.png similarity index 100% rename from doc/images/qtcreator-refactoring-find.png rename to doc/qtcreator/images/qtcreator-refactoring-find.png diff --git a/doc/images/qtcreator-refactoring-replace.png b/doc/qtcreator/images/qtcreator-refactoring-replace.png similarity index 100% rename from doc/images/qtcreator-refactoring-replace.png rename to doc/qtcreator/images/qtcreator-refactoring-replace.png diff --git a/doc/images/qtcreator-refactoring-virtual-function-dialog.png b/doc/qtcreator/images/qtcreator-refactoring-virtual-function-dialog.png similarity index 100% rename from doc/images/qtcreator-refactoring-virtual-function-dialog.png rename to doc/qtcreator/images/qtcreator-refactoring-virtual-function-dialog.png diff --git a/doc/images/qtcreator-reset-position-icon.png b/doc/qtcreator/images/qtcreator-reset-position-icon.png similarity index 100% rename from doc/images/qtcreator-reset-position-icon.png rename to doc/qtcreator/images/qtcreator-reset-position-icon.png diff --git a/doc/images/qtcreator-reset-size-icon.png b/doc/qtcreator/images/qtcreator-reset-size-icon.png similarity index 100% rename from doc/images/qtcreator-reset-size-icon.png rename to doc/qtcreator/images/qtcreator-reset-size-icon.png diff --git a/doc/images/qtcreator-run-environment.png b/doc/qtcreator/images/qtcreator-run-environment.png similarity index 100% rename from doc/images/qtcreator-run-environment.png rename to doc/qtcreator/images/qtcreator-run-environment.png diff --git a/doc/images/qtcreator-run-selected-tests.png b/doc/qtcreator/images/qtcreator-run-selected-tests.png similarity index 100% rename from doc/images/qtcreator-run-selected-tests.png rename to doc/qtcreator/images/qtcreator-run-selected-tests.png diff --git a/doc/images/qtcreator-run-settings-linux.png b/doc/qtcreator/images/qtcreator-run-settings-linux.png old mode 100755 new mode 100644 similarity index 100% rename from doc/images/qtcreator-run-settings-linux.png rename to doc/qtcreator/images/qtcreator-run-settings-linux.png diff --git a/doc/images/qtcreator-run-tests-in-current-file.png b/doc/qtcreator/images/qtcreator-run-tests-in-current-file.png similarity index 100% rename from doc/images/qtcreator-run-tests-in-current-file.png rename to doc/qtcreator/images/qtcreator-run-tests-in-current-file.png diff --git a/doc/images/qtcreator-screenshot-devconf-linux.png b/doc/qtcreator/images/qtcreator-screenshot-devconf-linux.png similarity index 100% rename from doc/images/qtcreator-screenshot-devconf-linux.png rename to doc/qtcreator/images/qtcreator-screenshot-devconf-linux.png diff --git a/doc/images/qtcreator-scxml-editor.png b/doc/qtcreator/images/qtcreator-scxml-editor.png similarity index 100% rename from doc/images/qtcreator-scxml-editor.png rename to doc/qtcreator/images/qtcreator-scxml-editor.png diff --git a/doc/images/qtcreator-search-allprojects.png b/doc/qtcreator/images/qtcreator-search-allprojects.png similarity index 100% rename from doc/images/qtcreator-search-allprojects.png rename to doc/qtcreator/images/qtcreator-search-allprojects.png diff --git a/doc/images/qtcreator-search-cpp-symbols.png b/doc/qtcreator/images/qtcreator-search-cpp-symbols.png similarity index 100% rename from doc/images/qtcreator-search-cpp-symbols.png rename to doc/qtcreator/images/qtcreator-search-cpp-symbols.png diff --git a/doc/images/qtcreator-search-filesystem.png b/doc/qtcreator/images/qtcreator-search-filesystem.png similarity index 100% rename from doc/images/qtcreator-search-filesystem.png rename to doc/qtcreator/images/qtcreator-search-filesystem.png diff --git a/doc/images/qtcreator-search-results.png b/doc/qtcreator/images/qtcreator-search-results.png similarity index 100% rename from doc/images/qtcreator-search-results.png rename to doc/qtcreator/images/qtcreator-search-results.png diff --git a/doc/images/qtcreator-searchresults.png b/doc/qtcreator/images/qtcreator-searchresults.png similarity index 100% rename from doc/images/qtcreator-searchresults.png rename to doc/qtcreator/images/qtcreator-searchresults.png diff --git a/doc/images/qtcreator-semanticerror-clang.png b/doc/qtcreator/images/qtcreator-semanticerror-clang.png similarity index 100% rename from doc/images/qtcreator-semanticerror-clang.png rename to doc/qtcreator/images/qtcreator-semanticerror-clang.png diff --git a/doc/images/qtcreator-semanticerror.png b/doc/qtcreator/images/qtcreator-semanticerror.png similarity index 100% rename from doc/images/qtcreator-semanticerror.png rename to doc/qtcreator/images/qtcreator-semanticerror.png diff --git a/doc/images/qtcreator-session-manager.png b/doc/qtcreator/images/qtcreator-session-manager.png similarity index 100% rename from doc/images/qtcreator-session-manager.png rename to doc/qtcreator/images/qtcreator-session-manager.png diff --git a/doc/images/qtcreator-setting-breakpoint1.png b/doc/qtcreator/images/qtcreator-setting-breakpoint1.png similarity index 100% rename from doc/images/qtcreator-setting-breakpoint1.png rename to doc/qtcreator/images/qtcreator-setting-breakpoint1.png diff --git a/doc/images/qtcreator-setting-breakpoint2.png b/doc/qtcreator/images/qtcreator-setting-breakpoint2.png similarity index 100% rename from doc/images/qtcreator-setting-breakpoint2.png rename to doc/qtcreator/images/qtcreator-setting-breakpoint2.png diff --git a/doc/images/qtcreator-settings-run-webassembly.png b/doc/qtcreator/images/qtcreator-settings-run-webassembly.png similarity index 100% rename from doc/images/qtcreator-settings-run-webassembly.png rename to doc/qtcreator/images/qtcreator-settings-run-webassembly.png diff --git a/doc/images/qtcreator-show-subprojects.png b/doc/qtcreator/images/qtcreator-show-subprojects.png similarity index 100% rename from doc/images/qtcreator-show-subprojects.png rename to doc/qtcreator/images/qtcreator-show-subprojects.png diff --git a/doc/images/qtcreator-sidebar-menu.png b/doc/qtcreator/images/qtcreator-sidebar-menu.png similarity index 100% rename from doc/images/qtcreator-sidebar-menu.png rename to doc/qtcreator/images/qtcreator-sidebar-menu.png diff --git a/doc/images/qtcreator-sidebar.png b/doc/qtcreator/images/qtcreator-sidebar.png similarity index 100% rename from doc/images/qtcreator-sidebar.png rename to doc/qtcreator/images/qtcreator-sidebar.png diff --git a/doc/images/qtcreator-snippet-modifiers.png b/doc/qtcreator/images/qtcreator-snippet-modifiers.png similarity index 100% rename from doc/images/qtcreator-snippet-modifiers.png rename to doc/qtcreator/images/qtcreator-snippet-modifiers.png diff --git a/doc/images/qtcreator-spliteditorview.png b/doc/qtcreator/images/qtcreator-spliteditorview.png similarity index 100% rename from doc/images/qtcreator-spliteditorview.png rename to doc/qtcreator/images/qtcreator-spliteditorview.png diff --git a/doc/images/qtcreator-ssh-key-configuration.png b/doc/qtcreator/images/qtcreator-ssh-key-configuration.png similarity index 100% rename from doc/images/qtcreator-ssh-key-configuration.png rename to doc/qtcreator/images/qtcreator-ssh-key-configuration.png diff --git a/doc/images/qtcreator-ssh-options.png b/doc/qtcreator/images/qtcreator-ssh-options.png similarity index 100% rename from doc/images/qtcreator-ssh-options.png rename to doc/qtcreator/images/qtcreator-ssh-options.png diff --git a/doc/images/qtcreator-syntax-highlighter.png b/doc/qtcreator/images/qtcreator-syntax-highlighter.png similarity index 100% rename from doc/images/qtcreator-syntax-highlighter.png rename to doc/qtcreator/images/qtcreator-syntax-highlighter.png diff --git a/doc/images/qtcreator-syntaxerror-clang.png b/doc/qtcreator/images/qtcreator-syntaxerror-clang.png similarity index 100% rename from doc/images/qtcreator-syntaxerror-clang.png rename to doc/qtcreator/images/qtcreator-syntaxerror-clang.png diff --git a/doc/images/qtcreator-syntaxerror.png b/doc/qtcreator/images/qtcreator-syntaxerror.png similarity index 100% rename from doc/images/qtcreator-syntaxerror.png rename to doc/qtcreator/images/qtcreator-syntaxerror.png diff --git a/doc/images/qtcreator-tests-view.png b/doc/qtcreator/images/qtcreator-tests-view.png similarity index 100% rename from doc/images/qtcreator-tests-view.png rename to doc/qtcreator/images/qtcreator-tests-view.png diff --git a/doc/images/qtcreator-texfinder-filter.png b/doc/qtcreator/images/qtcreator-texfinder-filter.png similarity index 100% rename from doc/images/qtcreator-texfinder-filter.png rename to doc/qtcreator/images/qtcreator-texfinder-filter.png diff --git a/doc/images/qtcreator-texfinder-ui-horizontal-layout.png b/doc/qtcreator/images/qtcreator-texfinder-ui-horizontal-layout.png similarity index 100% rename from doc/images/qtcreator-texfinder-ui-horizontal-layout.png rename to doc/qtcreator/images/qtcreator-texfinder-ui-horizontal-layout.png diff --git a/doc/images/qtcreator-text-encoding.png b/doc/qtcreator/images/qtcreator-text-encoding.png similarity index 100% rename from doc/images/qtcreator-text-encoding.png rename to doc/qtcreator/images/qtcreator-text-encoding.png diff --git a/doc/images/qtcreator-textfinder-contents.png b/doc/qtcreator/images/qtcreator-textfinder-contents.png similarity index 100% rename from doc/images/qtcreator-textfinder-contents.png rename to doc/qtcreator/images/qtcreator-textfinder-contents.png diff --git a/doc/images/qtcreator-textfinder-objectname.png b/doc/qtcreator/images/qtcreator-textfinder-objectname.png similarity index 100% rename from doc/images/qtcreator-textfinder-objectname.png rename to doc/qtcreator/images/qtcreator-textfinder-objectname.png diff --git a/doc/images/qtcreator-textfinder-screenshot.png b/doc/qtcreator/images/qtcreator-textfinder-screenshot.png similarity index 100% rename from doc/images/qtcreator-textfinder-screenshot.png rename to doc/qtcreator/images/qtcreator-textfinder-screenshot.png diff --git a/doc/images/qtcreator-textfinder-ui-widgets.png b/doc/qtcreator/images/qtcreator-textfinder-ui-widgets.png similarity index 100% rename from doc/images/qtcreator-textfinder-ui-widgets.png rename to doc/qtcreator/images/qtcreator-textfinder-ui-widgets.png diff --git a/doc/images/qtcreator-textfinder-ui.png b/doc/qtcreator/images/qtcreator-textfinder-ui.png similarity index 100% rename from doc/images/qtcreator-textfinder-ui.png rename to doc/qtcreator/images/qtcreator-textfinder-ui.png diff --git a/doc/images/qtcreator-todo-options.png b/doc/qtcreator/images/qtcreator-todo-options.png similarity index 100% rename from doc/images/qtcreator-todo-options.png rename to doc/qtcreator/images/qtcreator-todo-options.png diff --git a/doc/images/qtcreator-todo-pane.png b/doc/qtcreator/images/qtcreator-todo-pane.png similarity index 100% rename from doc/images/qtcreator-todo-pane.png rename to doc/qtcreator/images/qtcreator-todo-pane.png diff --git a/doc/images/qtcreator-togglebookmark.png b/doc/qtcreator/images/qtcreator-togglebookmark.png similarity index 100% rename from doc/images/qtcreator-togglebookmark.png rename to doc/qtcreator/images/qtcreator-togglebookmark.png diff --git a/doc/images/qtcreator-toolchains.png b/doc/qtcreator/images/qtcreator-toolchains.png similarity index 100% rename from doc/images/qtcreator-toolchains.png rename to doc/qtcreator/images/qtcreator-toolchains.png diff --git a/doc/images/qtcreator-tooltip-long.png b/doc/qtcreator/images/qtcreator-tooltip-long.png similarity index 100% rename from doc/images/qtcreator-tooltip-long.png rename to doc/qtcreator/images/qtcreator-tooltip-long.png diff --git a/doc/images/qtcreator-tooltip.png b/doc/qtcreator/images/qtcreator-tooltip.png similarity index 100% rename from doc/images/qtcreator-tooltip.png rename to doc/qtcreator/images/qtcreator-tooltip.png diff --git a/doc/images/qtcreator-typo-clang.png b/doc/qtcreator/images/qtcreator-typo-clang.png similarity index 100% rename from doc/images/qtcreator-typo-clang.png rename to doc/qtcreator/images/qtcreator-typo-clang.png diff --git a/doc/images/qtcreator-unclaimed-breakpoint-icon.png b/doc/qtcreator/images/qtcreator-unclaimed-breakpoint-icon.png similarity index 100% rename from doc/images/qtcreator-unclaimed-breakpoint-icon.png rename to doc/qtcreator/images/qtcreator-unclaimed-breakpoint-icon.png diff --git a/doc/images/qtcreator-valgrind-callgrind-options.png b/doc/qtcreator/images/qtcreator-valgrind-callgrind-options.png similarity index 100% rename from doc/images/qtcreator-valgrind-callgrind-options.png rename to doc/qtcreator/images/qtcreator-valgrind-callgrind-options.png diff --git a/doc/images/qtcreator-valgrind-callgrind.png b/doc/qtcreator/images/qtcreator-valgrind-callgrind.png old mode 100755 new mode 100644 similarity index 100% rename from doc/images/qtcreator-valgrind-callgrind.png rename to doc/qtcreator/images/qtcreator-valgrind-callgrind.png diff --git a/doc/images/qtcreator-valgrind-memcheck-options.png b/doc/qtcreator/images/qtcreator-valgrind-memcheck-options.png old mode 100755 new mode 100644 similarity index 100% rename from doc/images/qtcreator-valgrind-memcheck-options.png rename to doc/qtcreator/images/qtcreator-valgrind-memcheck-options.png diff --git a/doc/images/qtcreator-valgrind-memcheck.png b/doc/qtcreator/images/qtcreator-valgrind-memcheck.png similarity index 100% rename from doc/images/qtcreator-valgrind-memcheck.png rename to doc/qtcreator/images/qtcreator-valgrind-memcheck.png diff --git a/doc/images/qtcreator-valgrind-remote-settings.png b/doc/qtcreator/images/qtcreator-valgrind-remote-settings.png similarity index 100% rename from doc/images/qtcreator-valgrind-remote-settings.png rename to doc/qtcreator/images/qtcreator-valgrind-remote-settings.png diff --git a/doc/images/qtcreator-vcs-commit.png b/doc/qtcreator/images/qtcreator-vcs-commit.png similarity index 100% rename from doc/images/qtcreator-vcs-commit.png rename to doc/qtcreator/images/qtcreator-vcs-commit.png diff --git a/doc/images/qtcreator-vcs-diff.png b/doc/qtcreator/images/qtcreator-vcs-diff.png similarity index 100% rename from doc/images/qtcreator-vcs-diff.png rename to doc/qtcreator/images/qtcreator-vcs-diff.png diff --git a/doc/images/qtcreator-vcs-gitbranch.png b/doc/qtcreator/images/qtcreator-vcs-gitbranch.png similarity index 100% rename from doc/images/qtcreator-vcs-gitbranch.png rename to doc/qtcreator/images/qtcreator-vcs-gitbranch.png diff --git a/doc/images/qtcreator-vcs-pane.png b/doc/qtcreator/images/qtcreator-vcs-pane.png similarity index 100% rename from doc/images/qtcreator-vcs-pane.png rename to doc/qtcreator/images/qtcreator-vcs-pane.png diff --git a/doc/images/qtcreator-vcs-show.png b/doc/qtcreator/images/qtcreator-vcs-show.png similarity index 100% rename from doc/images/qtcreator-vcs-show.png rename to doc/qtcreator/images/qtcreator-vcs-show.png diff --git a/doc/images/qtcreator-watcher.png b/doc/qtcreator/images/qtcreator-watcher.png similarity index 100% rename from doc/images/qtcreator-watcher.png rename to doc/qtcreator/images/qtcreator-watcher.png diff --git a/doc/images/qtcreator-welcome-session.png b/doc/qtcreator/images/qtcreator-welcome-session.png similarity index 100% rename from doc/images/qtcreator-welcome-session.png rename to doc/qtcreator/images/qtcreator-welcome-session.png diff --git a/doc/images/qtquick-debugging-settings.png b/doc/qtcreator/images/qtquick-debugging-settings.png similarity index 100% rename from doc/images/qtquick-debugging-settings.png rename to doc/qtcreator/images/qtquick-debugging-settings.png diff --git a/doc/images/qtquick-designer-color-picker.png b/doc/qtcreator/images/qtquick-designer-color-picker.png similarity index 100% rename from doc/images/qtquick-designer-color-picker.png rename to doc/qtcreator/images/qtquick-designer-color-picker.png diff --git a/doc/images/qtquick-designer-gradient-picker.png b/doc/qtcreator/images/qtquick-designer-gradient-picker.png similarity index 100% rename from doc/images/qtquick-designer-gradient-picker.png rename to doc/qtcreator/images/qtquick-designer-gradient-picker.png diff --git a/doc/images/qtquick-designer-stacked-view.png b/doc/qtcreator/images/qtquick-designer-stacked-view.png similarity index 100% rename from doc/images/qtquick-designer-stacked-view.png rename to doc/qtcreator/images/qtquick-designer-stacked-view.png diff --git a/doc/images/qtquick-example-qml-inspector.png b/doc/qtcreator/images/qtquick-example-qml-inspector.png similarity index 100% rename from doc/images/qtquick-example-qml-inspector.png rename to doc/qtcreator/images/qtquick-example-qml-inspector.png diff --git a/doc/images/qtquick-example-setting-breakpoint1.png b/doc/qtcreator/images/qtquick-example-setting-breakpoint1.png similarity index 100% rename from doc/images/qtquick-example-setting-breakpoint1.png rename to doc/qtcreator/images/qtquick-example-setting-breakpoint1.png diff --git a/doc/images/qtquick-example-setting-breakpoint2.png b/doc/qtcreator/images/qtquick-example-setting-breakpoint2.png similarity index 100% rename from doc/images/qtquick-example-setting-breakpoint2.png rename to doc/qtcreator/images/qtquick-example-setting-breakpoint2.png diff --git a/doc/images/qtquick-example-setting-breakpoint3.png b/doc/qtcreator/images/qtquick-example-setting-breakpoint3.png similarity index 100% rename from doc/images/qtquick-example-setting-breakpoint3.png rename to doc/qtcreator/images/qtquick-example-setting-breakpoint3.png diff --git a/doc/images/qtquick-example-stack.png b/doc/qtcreator/images/qtquick-example-stack.png similarity index 100% rename from doc/images/qtquick-example-stack.png rename to doc/qtcreator/images/qtquick-example-stack.png diff --git a/doc/images/qtquick-states-binding-editor.png b/doc/qtcreator/images/qtquick-states-binding-editor.png similarity index 100% rename from doc/images/qtquick-states-binding-editor.png rename to doc/qtcreator/images/qtquick-states-binding-editor.png diff --git a/doc/images/refactormarker.png b/doc/qtcreator/images/refactormarker.png similarity index 100% rename from doc/images/refactormarker.png rename to doc/qtcreator/images/refactormarker.png diff --git a/doc/images/replace.png b/doc/qtcreator/images/replace.png similarity index 100% rename from doc/images/replace.png rename to doc/qtcreator/images/replace.png diff --git a/doc/images/samegame.png b/doc/qtcreator/images/samegame.png similarity index 100% rename from doc/images/samegame.png rename to doc/qtcreator/images/samegame.png diff --git a/doc/images/statistics.png b/doc/qtcreator/images/statistics.png similarity index 100% rename from doc/images/statistics.png rename to doc/qtcreator/images/statistics.png diff --git a/doc/images/studio-curve-editor.png b/doc/qtcreator/images/studio-curve-editor.png similarity index 100% rename from doc/images/studio-curve-editor.png rename to doc/qtcreator/images/studio-curve-editor.png diff --git a/doc/images/studio-easing-curve-editor.png b/doc/qtcreator/images/studio-easing-curve-editor.png similarity index 100% rename from doc/images/studio-easing-curve-editor.png rename to doc/qtcreator/images/studio-easing-curve-editor.png diff --git a/doc/images/studio-edit-keyframe.png b/doc/qtcreator/images/studio-edit-keyframe.png similarity index 100% rename from doc/images/studio-edit-keyframe.png rename to doc/qtcreator/images/studio-edit-keyframe.png diff --git a/doc/images/studio-timeline-settings.png b/doc/qtcreator/images/studio-timeline-settings.png similarity index 100% rename from doc/images/studio-timeline-settings.png rename to doc/qtcreator/images/studio-timeline-settings.png diff --git a/doc/images/studio-timeline.png b/doc/qtcreator/images/studio-timeline.png similarity index 100% rename from doc/images/studio-timeline.png rename to doc/qtcreator/images/studio-timeline.png diff --git a/doc/qtcreator-online.qdocconf b/doc/qtcreator/qtcreator-online.qdocconf similarity index 100% rename from doc/qtcreator-online.qdocconf rename to doc/qtcreator/qtcreator-online.qdocconf diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator/qtcreator.qdocconf similarity index 100% rename from doc/qtcreator.qdocconf rename to doc/qtcreator/qtcreator.qdocconf diff --git a/doc/src/analyze/cpu-usage-analyzer.qdoc b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc similarity index 100% rename from doc/src/analyze/cpu-usage-analyzer.qdoc rename to doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc diff --git a/doc/src/analyze/creator-analyze.qdoc b/doc/qtcreator/src/analyze/creator-analyze.qdoc similarity index 100% rename from doc/src/analyze/creator-analyze.qdoc rename to doc/qtcreator/src/analyze/creator-analyze.qdoc diff --git a/doc/src/analyze/creator-clang-static-analyzer.qdoc b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc similarity index 100% rename from doc/src/analyze/creator-clang-static-analyzer.qdoc rename to doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc diff --git a/doc/src/analyze/creator-cppcheck.qdoc b/doc/qtcreator/src/analyze/creator-cppcheck.qdoc similarity index 100% rename from doc/src/analyze/creator-cppcheck.qdoc rename to doc/qtcreator/src/analyze/creator-cppcheck.qdoc diff --git a/doc/src/analyze/creator-ctf-visualizer.qdoc b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc similarity index 100% rename from doc/src/analyze/creator-ctf-visualizer.qdoc rename to doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc diff --git a/doc/src/analyze/creator-heob.qdoc b/doc/qtcreator/src/analyze/creator-heob.qdoc similarity index 100% rename from doc/src/analyze/creator-heob.qdoc rename to doc/qtcreator/src/analyze/creator-heob.qdoc diff --git a/doc/src/analyze/creator-valgrind-overview.qdoc b/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc similarity index 100% rename from doc/src/analyze/creator-valgrind-overview.qdoc rename to doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc diff --git a/doc/src/analyze/creator-valgrind.qdoc b/doc/qtcreator/src/analyze/creator-valgrind.qdoc similarity index 100% rename from doc/src/analyze/creator-valgrind.qdoc rename to doc/qtcreator/src/analyze/creator-valgrind.qdoc diff --git a/doc/src/android/androiddev.qdoc b/doc/qtcreator/src/android/androiddev.qdoc similarity index 100% rename from doc/src/android/androiddev.qdoc rename to doc/qtcreator/src/android/androiddev.qdoc diff --git a/doc/src/android/creator-projects-settings-run-android.qdocinc b/doc/qtcreator/src/android/creator-projects-settings-run-android.qdocinc similarity index 100% rename from doc/src/android/creator-projects-settings-run-android.qdocinc rename to doc/qtcreator/src/android/creator-projects-settings-run-android.qdocinc diff --git a/doc/src/android/deploying-android.qdoc b/doc/qtcreator/src/android/deploying-android.qdoc similarity index 100% rename from doc/src/android/deploying-android.qdoc rename to doc/qtcreator/src/android/deploying-android.qdoc diff --git a/doc/src/baremetal/creator-baremetal-dev.qdoc b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc similarity index 100% rename from doc/src/baremetal/creator-baremetal-dev.qdoc rename to doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc diff --git a/doc/src/cmake/creator-projects-cmake-building.qdocinc b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdocinc similarity index 100% rename from doc/src/cmake/creator-projects-cmake-building.qdocinc rename to doc/qtcreator/src/cmake/creator-projects-cmake-building.qdocinc diff --git a/doc/src/cmake/creator-projects-cmake-deploying.qdocinc b/doc/qtcreator/src/cmake/creator-projects-cmake-deploying.qdocinc similarity index 100% rename from doc/src/cmake/creator-projects-cmake-deploying.qdocinc rename to doc/qtcreator/src/cmake/creator-projects-cmake-deploying.qdocinc diff --git a/doc/src/cmake/creator-projects-cmake.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc similarity index 100% rename from doc/src/cmake/creator-projects-cmake.qdoc rename to doc/qtcreator/src/cmake/creator-projects-cmake.qdoc diff --git a/doc/src/debugger/creator-debugger-common.qdocinc b/doc/qtcreator/src/debugger/creator-debugger-common.qdocinc similarity index 100% rename from doc/src/debugger/creator-debugger-common.qdocinc rename to doc/qtcreator/src/debugger/creator-debugger-common.qdocinc diff --git a/doc/src/debugger/creator-only/creator-debugger-example.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc similarity index 100% rename from doc/src/debugger/creator-only/creator-debugger-example.qdoc rename to doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc diff --git a/doc/src/debugger/creator-only/creator-debugger-setup.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc similarity index 100% rename from doc/src/debugger/creator-only/creator-debugger-setup.qdoc rename to doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc diff --git a/doc/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc similarity index 99% rename from doc/src/debugger/creator-only/creator-debugger.qdoc rename to doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc index 8497487fdb0..0fabd4656ff 100644 --- a/doc/src/debugger/creator-only/creator-debugger.qdoc +++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc @@ -818,7 +818,7 @@ The \c personaltypes.py file contains one example implementation: - \quotefromfile ../../share/qtcreator/debugger/personaltypes.py + \quotefromfile ../../../share/qtcreator/debugger/personaltypes.py \skipto qdump__ \printuntil d.putItem diff --git a/doc/src/debugger/qtquick-debugger-example.qdoc b/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc similarity index 100% rename from doc/src/debugger/qtquick-debugger-example.qdoc rename to doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc diff --git a/doc/src/debugger/qtquick-debugging.qdoc b/doc/qtcreator/src/debugger/qtquick-debugging.qdoc similarity index 100% rename from doc/src/debugger/qtquick-debugging.qdoc rename to doc/qtcreator/src/debugger/qtquick-debugging.qdoc diff --git a/doc/src/editors/creator-clangformat.qdocinc b/doc/qtcreator/src/editors/creator-clangformat.qdocinc similarity index 100% rename from doc/src/editors/creator-clangformat.qdocinc rename to doc/qtcreator/src/editors/creator-clangformat.qdocinc diff --git a/doc/src/editors/creator-code-completion.qdoc b/doc/qtcreator/src/editors/creator-code-completion.qdoc similarity index 100% rename from doc/src/editors/creator-code-completion.qdoc rename to doc/qtcreator/src/editors/creator-code-completion.qdoc diff --git a/doc/src/editors/creator-code-indentation.qdoc b/doc/qtcreator/src/editors/creator-code-indentation.qdoc similarity index 100% rename from doc/src/editors/creator-code-indentation.qdoc rename to doc/qtcreator/src/editors/creator-code-indentation.qdoc diff --git a/doc/src/editors/creator-code-refactoring.qdoc b/doc/qtcreator/src/editors/creator-code-refactoring.qdoc similarity index 100% rename from doc/src/editors/creator-code-refactoring.qdoc rename to doc/qtcreator/src/editors/creator-code-refactoring.qdoc diff --git a/doc/src/editors/creator-code-syntax.qdoc b/doc/qtcreator/src/editors/creator-code-syntax.qdoc similarity index 100% rename from doc/src/editors/creator-code-syntax.qdoc rename to doc/qtcreator/src/editors/creator-code-syntax.qdoc diff --git a/doc/src/editors/creator-coding-edit-mode.qdoc b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc similarity index 100% rename from doc/src/editors/creator-coding-edit-mode.qdoc rename to doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc diff --git a/doc/src/editors/creator-coding.qdoc b/doc/qtcreator/src/editors/creator-coding.qdoc similarity index 100% rename from doc/src/editors/creator-coding.qdoc rename to doc/qtcreator/src/editors/creator-coding.qdoc diff --git a/doc/src/editors/creator-diff-editor.qdoc b/doc/qtcreator/src/editors/creator-diff-editor.qdoc similarity index 100% rename from doc/src/editors/creator-diff-editor.qdoc rename to doc/qtcreator/src/editors/creator-diff-editor.qdoc diff --git a/doc/src/editors/creator-editors-options-text.qdoc b/doc/qtcreator/src/editors/creator-editors-options-text.qdoc similarity index 100% rename from doc/src/editors/creator-editors-options-text.qdoc rename to doc/qtcreator/src/editors/creator-editors-options-text.qdoc diff --git a/doc/src/editors/creator-editors-options.qdoc b/doc/qtcreator/src/editors/creator-editors-options.qdoc similarity index 100% rename from doc/src/editors/creator-editors-options.qdoc rename to doc/qtcreator/src/editors/creator-editors-options.qdoc diff --git a/doc/src/editors/creator-editors-writing-code.qdoc b/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc similarity index 100% rename from doc/src/editors/creator-editors-writing-code.qdoc rename to doc/qtcreator/src/editors/creator-editors-writing-code.qdoc diff --git a/doc/src/editors/creator-finding.qdoc b/doc/qtcreator/src/editors/creator-finding.qdoc similarity index 100% rename from doc/src/editors/creator-finding.qdoc rename to doc/qtcreator/src/editors/creator-finding.qdoc diff --git a/doc/src/editors/creator-locator.qdoc b/doc/qtcreator/src/editors/creator-locator.qdoc similarity index 100% rename from doc/src/editors/creator-locator.qdoc rename to doc/qtcreator/src/editors/creator-locator.qdoc diff --git a/doc/src/editors/creator-only/creator-beautifier.qdoc b/doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc similarity index 100% rename from doc/src/editors/creator-only/creator-beautifier.qdoc rename to doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc diff --git a/doc/src/editors/creator-only/creator-clang-codemodel.qdoc b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc similarity index 100% rename from doc/src/editors/creator-only/creator-clang-codemodel.qdoc rename to doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc diff --git a/doc/src/editors/creator-only/creator-code-pasting.qdoc b/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc similarity index 100% rename from doc/src/editors/creator-only/creator-code-pasting.qdoc rename to doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc diff --git a/doc/src/editors/creator-only/creator-compilation-database.qdocinc b/doc/qtcreator/src/editors/creator-only/creator-compilation-database.qdocinc similarity index 100% rename from doc/src/editors/creator-only/creator-compilation-database.qdocinc rename to doc/qtcreator/src/editors/creator-only/creator-compilation-database.qdocinc diff --git a/doc/src/editors/creator-only/creator-fakevim.qdoc b/doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc similarity index 100% rename from doc/src/editors/creator-only/creator-fakevim.qdoc rename to doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc diff --git a/doc/src/editors/creator-only/creator-language-server.qdoc b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc similarity index 100% rename from doc/src/editors/creator-only/creator-language-server.qdoc rename to doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc diff --git a/doc/src/editors/creator-only/creator-mime-types.qdoc b/doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc similarity index 100% rename from doc/src/editors/creator-only/creator-mime-types.qdoc rename to doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc diff --git a/doc/src/editors/creator-only/creator-modeling.qdoc b/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc similarity index 100% rename from doc/src/editors/creator-only/creator-modeling.qdoc rename to doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc diff --git a/doc/src/editors/creator-only/creator-scxml.qdoc b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc similarity index 100% rename from doc/src/editors/creator-only/creator-scxml.qdoc rename to doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc diff --git a/doc/src/editors/creator-only/creator-text-editing-macros.qdoc b/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc similarity index 100% rename from doc/src/editors/creator-only/creator-text-editing-macros.qdoc rename to doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc diff --git a/doc/src/editors/creator-search.qdoc b/doc/qtcreator/src/editors/creator-search.qdoc similarity index 100% rename from doc/src/editors/creator-search.qdoc rename to doc/qtcreator/src/editors/creator-search.qdoc diff --git a/doc/src/editors/creator-semantic-highlighting.qdoc b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc similarity index 100% rename from doc/src/editors/creator-semantic-highlighting.qdoc rename to doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc diff --git a/doc/src/external-resources/external-resources.qdoc b/doc/qtcreator/src/external-resources/external-resources.qdoc similarity index 100% rename from doc/src/external-resources/external-resources.qdoc rename to doc/qtcreator/src/external-resources/external-resources.qdoc diff --git a/doc/src/howto/creator-external-tools.qdoc b/doc/qtcreator/src/howto/creator-external-tools.qdoc similarity index 100% rename from doc/src/howto/creator-external-tools.qdoc rename to doc/qtcreator/src/howto/creator-external-tools.qdoc diff --git a/doc/src/howto/creator-help.qdoc b/doc/qtcreator/src/howto/creator-help.qdoc similarity index 100% rename from doc/src/howto/creator-help.qdoc rename to doc/qtcreator/src/howto/creator-help.qdoc diff --git a/doc/src/howto/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc similarity index 100% rename from doc/src/howto/creator-keyboard-shortcuts.qdoc rename to doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc diff --git a/doc/src/howto/creator-only/creator-autotest.qdoc b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc similarity index 100% rename from doc/src/howto/creator-only/creator-autotest.qdoc rename to doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc diff --git a/doc/src/howto/creator-only/creator-cli.qdoc b/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc similarity index 100% rename from doc/src/howto/creator-only/creator-cli.qdoc rename to doc/qtcreator/src/howto/creator-only/creator-cli.qdoc diff --git a/doc/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc similarity index 100% rename from doc/src/howto/creator-only/creator-how-tos.qdoc rename to doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc diff --git a/doc/src/howto/creator-only/creator-sessions.qdoc b/doc/qtcreator/src/howto/creator-only/creator-sessions.qdoc similarity index 100% rename from doc/src/howto/creator-only/creator-sessions.qdoc rename to doc/qtcreator/src/howto/creator-only/creator-sessions.qdoc diff --git a/doc/src/howto/creator-only/creator-task-lists.qdoc b/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc similarity index 100% rename from doc/src/howto/creator-only/creator-task-lists.qdoc rename to doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc diff --git a/doc/src/howto/creator-only/qtcreator-faq.qdoc b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc similarity index 100% rename from doc/src/howto/creator-only/qtcreator-faq.qdoc rename to doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc diff --git a/doc/src/howto/creator-sidebar-views.qdoc b/doc/qtcreator/src/howto/creator-sidebar-views.qdoc similarity index 100% rename from doc/src/howto/creator-sidebar-views.qdoc rename to doc/qtcreator/src/howto/creator-sidebar-views.qdoc diff --git a/doc/src/howto/creator-ui.qdoc b/doc/qtcreator/src/howto/creator-ui.qdoc similarity index 100% rename from doc/src/howto/creator-ui.qdoc rename to doc/qtcreator/src/howto/creator-ui.qdoc diff --git a/doc/src/ios/creator-ios-dev.qdoc b/doc/qtcreator/src/ios/creator-ios-dev.qdoc similarity index 100% rename from doc/src/ios/creator-ios-dev.qdoc rename to doc/qtcreator/src/ios/creator-ios-dev.qdoc diff --git a/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc similarity index 100% rename from doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc rename to doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc diff --git a/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc b/doc/qtcreator/src/linux-mobile/creator-projects-running-generic-linux.qdocinc similarity index 100% rename from doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc rename to doc/qtcreator/src/linux-mobile/creator-projects-running-generic-linux.qdocinc diff --git a/doc/src/linux-mobile/creator-projects-settings-run-b2qt.qdocinc b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdocinc similarity index 100% rename from doc/src/linux-mobile/creator-projects-settings-run-b2qt.qdocinc rename to doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdocinc diff --git a/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdocinc similarity index 100% rename from doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc rename to doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdocinc diff --git a/doc/src/linux-mobile/linuxdev-keys.qdocinc b/doc/qtcreator/src/linux-mobile/linuxdev-keys.qdocinc similarity index 100% rename from doc/src/linux-mobile/linuxdev-keys.qdocinc rename to doc/qtcreator/src/linux-mobile/linuxdev-keys.qdocinc diff --git a/doc/src/linux-mobile/linuxdev-processes.qdocinc b/doc/qtcreator/src/linux-mobile/linuxdev-processes.qdocinc similarity index 100% rename from doc/src/linux-mobile/linuxdev-processes.qdocinc rename to doc/qtcreator/src/linux-mobile/linuxdev-processes.qdocinc diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/qtcreator/src/linux-mobile/linuxdev.qdoc similarity index 100% rename from doc/src/linux-mobile/linuxdev.qdoc rename to doc/qtcreator/src/linux-mobile/linuxdev.qdoc diff --git a/doc/src/mcu/creator-mcu-dev.qdoc b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc similarity index 100% rename from doc/src/mcu/creator-mcu-dev.qdoc rename to doc/qtcreator/src/mcu/creator-mcu-dev.qdoc diff --git a/doc/src/overview/creator-acknowledgements.qdoc b/doc/qtcreator/src/overview/creator-acknowledgements.qdoc similarity index 100% rename from doc/src/overview/creator-acknowledgements.qdoc rename to doc/qtcreator/src/overview/creator-acknowledgements.qdoc diff --git a/doc/src/overview/creator-only/creator-advanced.qdoc b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-advanced.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc diff --git a/doc/src/overview/creator-only/creator-commercial-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-commercial-overview.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-commercial-overview.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-commercial-overview.qdoc diff --git a/doc/src/overview/creator-only/creator-configuring.qdoc b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-configuring.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc diff --git a/doc/src/overview/creator-only/creator-deployment-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-deployment-overview.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc diff --git a/doc/src/overview/creator-only/creator-design-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-design-overview.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc diff --git a/doc/src/overview/creator-only/creator-getting-started.qdoc b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-getting-started.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc diff --git a/doc/src/overview/creator-only/creator-glossary.qdoc b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-glossary.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc diff --git a/doc/src/overview/creator-only/creator-help-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-help-overview.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc diff --git a/doc/src/overview/creator-only/creator-issues.qdoc b/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-issues.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-issues.qdoc diff --git a/doc/src/overview/creator-only/creator-mobile-targets.qdoc b/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-mobile-targets.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc diff --git a/doc/src/overview/creator-only/creator-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-overview.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-overview.qdoc diff --git a/doc/src/overview/creator-only/creator-supported-platforms.qdoc b/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-supported-platforms.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc diff --git a/doc/src/overview/creator-only/creator-target-platforms.qdocinc b/doc/qtcreator/src/overview/creator-only/creator-target-platforms.qdocinc similarity index 100% rename from doc/src/overview/creator-only/creator-target-platforms.qdocinc rename to doc/qtcreator/src/overview/creator-only/creator-target-platforms.qdocinc diff --git a/doc/src/overview/creator-only/creator-tech-support.qdoc b/doc/qtcreator/src/overview/creator-only/creator-tech-support.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-tech-support.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-tech-support.qdoc diff --git a/doc/src/overview/creator-only/creator-testing.qdoc b/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-testing.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-testing.qdoc diff --git a/doc/src/overview/creator-only/creator-tutorials.qdoc b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc similarity index 100% rename from doc/src/overview/creator-only/creator-tutorials.qdoc rename to doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc diff --git a/doc/src/overview/creator-only/mobile-app-design.qdoc b/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc similarity index 100% rename from doc/src/overview/creator-only/mobile-app-design.qdoc rename to doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-autotools.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-autotools.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-autotools.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-autotools.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-build-systems.qdocinc b/doc/qtcreator/src/projects/creator-only/creator-projects-build-systems.qdocinc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-build-systems.qdocinc rename to doc/qtcreator/src/projects/creator-only/creator-projects-build-systems.qdocinc diff --git a/doc/src/projects/creator-only/creator-projects-building-running.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-building-running.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-building.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-building.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-builds-customizing.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-builds-customizing.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-builds-customizing.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-builds-customizing.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-compilers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-compilers.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-creating.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-creating.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc rename to doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc diff --git a/doc/src/projects/creator-only/creator-projects-custom-wizards.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-custom-wizards.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-debuggers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-debuggers.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-generic.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-generic.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-libraries.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-libraries.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc new file mode 100644 index 00000000000..a517d633835 --- /dev/null +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Creator documentation. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** +****************************************************************************/ + +/*! + \contentspage index.html + \previouspage creator-project-generic.html + \page creator-project-nimble.html + \nextpage creator-cli.html + + \title Setting Up Nimble + + \l {https://github.com/nim-lang/nimble#readme}{Nimble} is a package + manager for the Nim programming language. It is delivered with + \l{https://nim-lang.org/}{Nim} and uses the Nim compiler to generate + executables that are supported on Windows, Linux, and \macos. + + To use \QC for Nim development, you need to enable the experimental + Nim plugin. Select \uicontrol Help > \uicontrol {About Plugins} > + \uicontrol {Other Languages} > \uicontrol Nim, and then restart \QC. + + In addition, you have to download and install Nim and set up a Nim kit + in \QC. + + You can use wizards to create Nim and Nimble projects. + + \section1 Setting Up the Development Environment + + To configure \QC to build Nim executables: + + \list 1 + \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits + \uicontrol Compilers > \uicontrol Add > \uicontrol Nim to specify + the path to the the Nim compiler. + \li Select \uicontrol Apply to add the compiler. + \li Select \uicontrol Kits > \uicontrol Add to add a kit for building + applications with Nimble: + \image qtcreator-kit-nimble.png "Nimble kit" + \list 1 + \li In the \uicontrol Name field, specify a name for the kit. + \li In the \uicontrol Compiler group, \uicontrol Nim field, + select the Nim compiler you added above. + \li Select \uicontrol Apply to add the kit. + \endlist + \endlist + + \section1 Creating Nimble Applications + + To use a wizard to create boilerplate files for a Nim package that is + managed with Nimble: + + \list 1 + \li Select \uicontrol File > \uicontrol {New File or Project} > + \uicontrol Projects > \uicontrol {Non-Qt Project} > + \uicontrol {Nimble Application}. + \li Specify the name and location of the application. + \li Select \uicontrol Next. + \li Specify information about your application package. + \image qtcreator-project-nimble.png + \li Select \uicontrol Next to create the project. + \endlist +*/ diff --git a/doc/src/projects/creator-only/creator-projects-opening.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-opening.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-other.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-other.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-overview.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-overview.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-qbs.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-qbs.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-qbs.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-qbs.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-qt-versions.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-qt-versions.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-settings-build-qbs.qdocinc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdocinc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-settings-build-qbs.qdocinc rename to doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdocinc diff --git a/doc/src/projects/creator-only/creator-projects-settings-build.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-settings-build.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-settings-code-style.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-code-style.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-settings-code-style.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-settings-code-style.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-settings-dependencies.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-settings-dependencies.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-settings-editor.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-settings-editor.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-settings-overview.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-settings-overview.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-settings-run-analyze.qdocinc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdocinc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-settings-run-analyze.qdocinc rename to doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdocinc diff --git a/doc/src/projects/creator-only/creator-projects-settings-run-debug.qdocinc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-debug.qdocinc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-settings-run-debug.qdocinc rename to doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-debug.qdocinc diff --git a/doc/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc rename to doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc diff --git a/doc/src/projects/creator-only/creator-projects-settings-run.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-settings-run.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-settings-sharing.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-settings-sharing.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc diff --git a/doc/src/projects/creator-only/creator-projects-targets.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc similarity index 100% rename from doc/src/projects/creator-only/creator-projects-targets.qdoc rename to doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/qtcreator/src/projects/creator-projects-running.qdoc similarity index 100% rename from doc/src/projects/creator-projects-running.qdoc rename to doc/qtcreator/src/projects/creator-projects-running.qdoc diff --git a/doc/src/python/creator-python-project.qdocinc b/doc/qtcreator/src/python/creator-python-project.qdocinc similarity index 100% rename from doc/src/python/creator-python-project.qdocinc rename to doc/qtcreator/src/python/creator-python-project.qdocinc diff --git a/doc/src/python/creator-python-run.qdocinc b/doc/qtcreator/src/python/creator-python-run.qdocinc similarity index 100% rename from doc/src/python/creator-python-run.qdocinc rename to doc/qtcreator/src/python/creator-python-run.qdocinc diff --git a/doc/src/qnx/creator-deployment-qnx.qdoc b/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc similarity index 100% rename from doc/src/qnx/creator-deployment-qnx.qdoc rename to doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc diff --git a/doc/src/qnx/creator-developing-qnx.qdoc b/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc similarity index 100% rename from doc/src/qnx/creator-developing-qnx.qdoc rename to doc/qtcreator/src/qnx/creator-developing-qnx.qdoc diff --git a/doc/src/qnx/creator-projects-running-qnx.qdocinc b/doc/qtcreator/src/qnx/creator-projects-running-qnx.qdocinc similarity index 100% rename from doc/src/qnx/creator-projects-running-qnx.qdocinc rename to doc/qtcreator/src/qnx/creator-projects-running-qnx.qdocinc diff --git a/doc/src/qnx/creator-projects-settings-run-qnx.qdocinc b/doc/qtcreator/src/qnx/creator-projects-settings-run-qnx.qdocinc similarity index 100% rename from doc/src/qnx/creator-projects-settings-run-qnx.qdocinc rename to doc/qtcreator/src/qnx/creator-projects-settings-run-qnx.qdocinc diff --git a/doc/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc similarity index 100% rename from doc/src/qtcreator-toc.qdoc rename to doc/qtcreator/src/qtcreator-toc.qdoc diff --git a/doc/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc similarity index 100% rename from doc/src/qtcreator.qdoc rename to doc/qtcreator/src/qtcreator.qdoc diff --git a/doc/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc similarity index 100% rename from doc/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc rename to doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc diff --git a/doc/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc b/doc/qtcreator/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc similarity index 100% rename from doc/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc rename to doc/qtcreator/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc diff --git a/doc/src/qtquick/creator-only/qtquick-app-development.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc similarity index 100% rename from doc/src/qtquick/creator-only/qtquick-app-development.qdoc rename to doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc diff --git a/doc/src/qtquick/creator-only/qtquick-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc similarity index 100% rename from doc/src/qtquick/creator-only/qtquick-app-tutorial.qdoc rename to doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc diff --git a/doc/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc similarity index 100% rename from doc/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc rename to doc/qtcreator/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc diff --git a/doc/src/qtquick/creator-only/qtquick-creating.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc similarity index 100% rename from doc/src/qtquick/creator-only/qtquick-creating.qdoc rename to doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc diff --git a/doc/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc similarity index 100% rename from doc/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc rename to doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc diff --git a/doc/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc similarity index 100% rename from doc/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc rename to doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc diff --git a/doc/src/qtquick/creator-only/qtquick-states-scxml.qdocinc b/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc similarity index 100% rename from doc/src/qtquick/creator-only/qtquick-states-scxml.qdocinc rename to doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc diff --git a/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc b/doc/qtcreator/src/qtquick/creator-projects-settings-run-qtquick.qdocinc similarity index 100% rename from doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc rename to doc/qtcreator/src/qtquick/creator-projects-settings-run-qtquick.qdocinc diff --git a/doc/src/qtquick/qt-design-viewer.qdoc b/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc similarity index 100% rename from doc/src/qtquick/qt-design-viewer.qdoc rename to doc/qtcreator/src/qtquick/qt-design-viewer.qdoc diff --git a/doc/src/qtquick/qtquick-buttons.qdoc b/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-buttons.qdoc rename to doc/qtcreator/src/qtquick/qtquick-buttons.qdoc diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/qtcreator/src/qtquick/qtquick-components.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-components.qdoc rename to doc/qtcreator/src/qtquick/qtquick-components.qdoc diff --git a/doc/src/qtquick/qtquick-connection-editor-bindings.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-connection-editor-bindings.qdoc rename to doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc diff --git a/doc/src/qtquick/qtquick-connection-editor-properties.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-connection-editor-properties.qdoc rename to doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc diff --git a/doc/src/qtquick/qtquick-connection-editor-signals.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-connection-editor-signals.qdoc rename to doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc diff --git a/doc/src/qtquick/qtquick-connection-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-connection-editor.qdoc rename to doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-designer.qdoc rename to doc/qtcreator/src/qtquick/qtquick-designer.qdoc diff --git a/doc/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc rename to doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc diff --git a/doc/src/qtquick/qtquick-live-preview-desktop.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-live-preview-desktop.qdoc rename to doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc diff --git a/doc/src/qtquick/qtquick-live-preview-devices.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-live-preview-devices.qdoc rename to doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc diff --git a/doc/src/qtquick/qtquick-live-preview.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-live-preview.qdoc rename to doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc diff --git a/doc/src/qtquick/qtquick-navigator.qdoc b/doc/qtcreator/src/qtquick/qtquick-navigator.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-navigator.qdoc rename to doc/qtcreator/src/qtquick/qtquick-navigator.qdoc diff --git a/doc/src/qtquick/qtquick-pathview-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-pathview-editor.qdoc rename to doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc diff --git a/doc/src/qtquick/qtquick-profiler.qdoc b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-profiler.qdoc rename to doc/qtcreator/src/qtquick/qtquick-profiler.qdoc diff --git a/doc/src/qtquick/qtquick-properties.qdoc b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-properties.qdoc rename to doc/qtcreator/src/qtquick/qtquick-properties.qdoc diff --git a/doc/src/qtquick/qtquick-states.qdoc b/doc/qtcreator/src/qtquick/qtquick-states.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-states.qdoc rename to doc/qtcreator/src/qtquick/qtquick-states.qdoc diff --git a/doc/src/qtquick/qtquick-timeline.qdoc b/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-timeline.qdoc rename to doc/qtcreator/src/qtquick/qtquick-timeline.qdoc diff --git a/doc/src/qtquick/qtquick-toolbars.qdoc b/doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-toolbars.qdoc rename to doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc diff --git a/doc/src/qtquick/qtquick-ui-forms.qdoc b/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-ui-forms.qdoc rename to doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc diff --git a/doc/src/vcs/creator-only/creator-vcs-bazaar.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-bazaar.qdoc similarity index 100% rename from doc/src/vcs/creator-only/creator-vcs-bazaar.qdoc rename to doc/qtcreator/src/vcs/creator-only/creator-vcs-bazaar.qdoc diff --git a/doc/src/vcs/creator-only/creator-vcs-clearcase.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-clearcase.qdoc similarity index 100% rename from doc/src/vcs/creator-only/creator-vcs-clearcase.qdoc rename to doc/qtcreator/src/vcs/creator-only/creator-vcs-clearcase.qdoc diff --git a/doc/src/vcs/creator-only/creator-vcs-cvs.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-cvs.qdoc similarity index 100% rename from doc/src/vcs/creator-only/creator-vcs-cvs.qdoc rename to doc/qtcreator/src/vcs/creator-only/creator-vcs-cvs.qdoc diff --git a/doc/src/vcs/creator-only/creator-vcs-mercurial.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-mercurial.qdoc similarity index 100% rename from doc/src/vcs/creator-only/creator-vcs-mercurial.qdoc rename to doc/qtcreator/src/vcs/creator-only/creator-vcs-mercurial.qdoc diff --git a/doc/src/vcs/creator-only/creator-vcs-options.qdocinc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-options.qdocinc similarity index 100% rename from doc/src/vcs/creator-only/creator-vcs-options.qdocinc rename to doc/qtcreator/src/vcs/creator-only/creator-vcs-options.qdocinc diff --git a/doc/src/vcs/creator-only/creator-vcs-perforce.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc similarity index 100% rename from doc/src/vcs/creator-only/creator-vcs-perforce.qdoc rename to doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc diff --git a/doc/src/vcs/creator-only/creator-vcs-subversion.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-subversion.qdoc similarity index 100% rename from doc/src/vcs/creator-only/creator-vcs-subversion.qdoc rename to doc/qtcreator/src/vcs/creator-only/creator-vcs-subversion.qdoc diff --git a/doc/src/vcs/creator-only/creator-vcs.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc similarity index 100% rename from doc/src/vcs/creator-only/creator-vcs.qdoc rename to doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc diff --git a/doc/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc similarity index 100% rename from doc/src/vcs/creator-vcs-git.qdoc rename to doc/qtcreator/src/vcs/creator-vcs-git.qdoc diff --git a/doc/src/webassembly/creator-webassembly.qdoc b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc similarity index 100% rename from doc/src/webassembly/creator-webassembly.qdoc rename to doc/qtcreator/src/webassembly/creator-webassembly.qdoc diff --git a/doc/src/widgets/creator-faq-qtdesigner.qdocinc b/doc/qtcreator/src/widgets/creator-faq-qtdesigner.qdocinc similarity index 100% rename from doc/src/widgets/creator-faq-qtdesigner.qdocinc rename to doc/qtcreator/src/widgets/creator-faq-qtdesigner.qdocinc diff --git a/doc/src/widgets/doc_src_plugins.qdocinc b/doc/qtcreator/src/widgets/doc_src_plugins.qdocinc similarity index 100% rename from doc/src/widgets/doc_src_plugins.qdocinc rename to doc/qtcreator/src/widgets/doc_src_plugins.qdocinc diff --git a/doc/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc similarity index 100% rename from doc/src/widgets/qtdesigner-app-tutorial.qdoc rename to doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc diff --git a/doc/src/widgets/qtdesigner-overview.qdoc b/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc similarity index 100% rename from doc/src/widgets/qtdesigner-overview.qdoc rename to doc/qtcreator/src/widgets/qtdesigner-overview.qdoc diff --git a/doc/src/widgets/qtdesigner-plugins.qdoc b/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc similarity index 100% rename from doc/src/widgets/qtdesigner-plugins.qdoc rename to doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc diff --git a/doc/config/qtcreator-developer.qdocconf b/doc/qtcreatordev/config/qtcreator-developer.qdocconf similarity index 52% rename from doc/config/qtcreator-developer.qdocconf rename to doc/qtcreatordev/config/qtcreator-developer.qdocconf index ef4a1eb8d56..6349387ca93 100644 --- a/doc/config/qtcreator-developer.qdocconf +++ b/doc/qtcreatordev/config/qtcreator-developer.qdocconf @@ -4,32 +4,32 @@ description = "Extending Qt Creator Manual" language = Cpp headerdirs = . \ - ../api \ - ../../src/libs/aggregation \ - ../../src/libs/cplusplus \ - ../../src/libs/extensionsystem \ - ../../src/libs/utils \ - ../../src/libs/qmljs \ - ../../src/libs/qtcreatorcdbext \ - ../../src/plugins/coreplugin \ - ../../src/plugins/debugger \ - ../../src/plugins/vcsbase \ - ../../src/plugins/projectexplorer \ - ../../src/plugins/texteditor + ../src \ + ../../../src/libs/aggregation \ + ../../../src/libs/cplusplus \ + ../../../src/libs/extensionsystem \ + ../../../src/libs/utils \ + ../../../src/libs/qmljs \ + ../../../src/libs/qtcreatorcdbext \ + ../../../src/plugins/coreplugin \ + ../../../src/plugins/debugger \ + ../../../src/plugins/vcsbase \ + ../../../src/plugins/projectexplorer \ + ../../../src/plugins/texteditor sourcedirs = . \ - ../api \ - ../../src/libs/aggregation \ - ../../src/libs/cplusplus \ - ../../src/libs/extensionsystem \ - ../../src/libs/utils \ - ../../src/libs/qmljs \ - ../../src/libs/qtcreatorcdbext \ - ../../src/plugins/coreplugin \ - ../../src/plugins/debugger \ - ../../src/plugins/vcsbase \ - ../../src/plugins/projectexplorer\ - ../../src/plugins/texteditor + ../src \ + ../../../src/libs/aggregation \ + ../../../src/libs/cplusplus \ + ../../../src/libs/extensionsystem \ + ../../../src/libs/utils \ + ../../../src/libs/qmljs \ + ../../../src/libs/qtcreatorcdbext \ + ../../../src/plugins/coreplugin \ + ../../../src/plugins/debugger \ + ../../../src/plugins/vcsbase \ + ../../../src/plugins/projectexplorer\ + ../../../src/plugins/texteditor # -- Uncomment following option to generate complete documentation # instead of public API documentation only. @@ -38,8 +38,9 @@ sourcedirs = . \ headers.fileextensions = "*.h" sources.fileextensions = "*.cpp *.qdoc" -imagedirs = ../api/images ../images ../templates/images -exampledirs = ../api/examples +imagedirs = ../images \ + ../../config/images +exampledirs = ../examples depends += qtwidgets \ qtcore \ @@ -57,9 +58,9 @@ depends += qtwidgets \ qtwebkit \ qtxml -include(macros.qdocconf) -include(qt-cpp-ignore.qdocconf) -include(qt-defines.qdocconf) +include(../../config/macros.qdocconf) +include(../../config/qt-cpp-ignore.qdocconf) +include(../../config/qt-defines.qdocconf) qhp.projects = QtCreatorDev qhp.QtCreatorDev.file = qtcreator-dev.qhp diff --git a/doc/api/examples/aggregation/README b/doc/qtcreatordev/examples/aggregation/README similarity index 100% rename from doc/api/examples/aggregation/README rename to doc/qtcreatordev/examples/aggregation/README diff --git a/doc/api/examples/aggregation/output.txt b/doc/qtcreatordev/examples/aggregation/output.txt similarity index 100% rename from doc/api/examples/aggregation/output.txt rename to doc/qtcreatordev/examples/aggregation/output.txt diff --git a/doc/api/examples/aggregation/test.sh b/doc/qtcreatordev/examples/aggregation/test.sh old mode 100755 new mode 100644 similarity index 100% rename from doc/api/examples/aggregation/test.sh rename to doc/qtcreatordev/examples/aggregation/test.sh diff --git a/doc/api/examples/exampleplugin/Example.json.in b/doc/qtcreatordev/examples/exampleplugin/Example.json.in similarity index 100% rename from doc/api/examples/exampleplugin/Example.json.in rename to doc/qtcreatordev/examples/exampleplugin/Example.json.in diff --git a/doc/api/examples/exampleplugin/example.pro b/doc/qtcreatordev/examples/exampleplugin/example.pro similarity index 100% rename from doc/api/examples/exampleplugin/example.pro rename to doc/qtcreatordev/examples/exampleplugin/example.pro diff --git a/doc/api/examples/exampleplugin/example_global.h b/doc/qtcreatordev/examples/exampleplugin/example_global.h similarity index 100% rename from doc/api/examples/exampleplugin/example_global.h rename to doc/qtcreatordev/examples/exampleplugin/example_global.h diff --git a/doc/api/examples/exampleplugin/exampleconstants.h b/doc/qtcreatordev/examples/exampleplugin/exampleconstants.h similarity index 100% rename from doc/api/examples/exampleplugin/exampleconstants.h rename to doc/qtcreatordev/examples/exampleplugin/exampleconstants.h diff --git a/doc/api/examples/exampleplugin/exampleplugin.cpp b/doc/qtcreatordev/examples/exampleplugin/exampleplugin.cpp similarity index 100% rename from doc/api/examples/exampleplugin/exampleplugin.cpp rename to doc/qtcreatordev/examples/exampleplugin/exampleplugin.cpp diff --git a/doc/api/examples/exampleplugin/exampleplugin.h b/doc/qtcreatordev/examples/exampleplugin/exampleplugin.h similarity index 100% rename from doc/api/examples/exampleplugin/exampleplugin.h rename to doc/qtcreatordev/examples/exampleplugin/exampleplugin.h diff --git a/doc/api/images/firstplugin-kitselection.png b/doc/qtcreatordev/images/firstplugin-kitselection.png similarity index 100% rename from doc/api/images/firstplugin-kitselection.png rename to doc/qtcreatordev/images/firstplugin-kitselection.png diff --git a/doc/api/images/firstplugin-menuitem.png b/doc/qtcreatordev/images/firstplugin-menuitem.png similarity index 100% rename from doc/api/images/firstplugin-menuitem.png rename to doc/qtcreatordev/images/firstplugin-menuitem.png diff --git a/doc/api/images/firstplugin-nameandpath.png b/doc/qtcreatordev/images/firstplugin-nameandpath.png similarity index 100% rename from doc/api/images/firstplugin-nameandpath.png rename to doc/qtcreatordev/images/firstplugin-nameandpath.png diff --git a/doc/api/images/firstplugin-pluginsetup.png b/doc/qtcreatordev/images/firstplugin-pluginsetup.png similarity index 100% rename from doc/api/images/firstplugin-pluginsetup.png rename to doc/qtcreatordev/images/firstplugin-pluginsetup.png diff --git a/doc/api/images/firstplugin-runsettings.png b/doc/qtcreatordev/images/firstplugin-runsettings.png similarity index 100% rename from doc/api/images/firstplugin-runsettings.png rename to doc/qtcreatordev/images/firstplugin-runsettings.png diff --git a/doc/api/images/firstplugin-summary.png b/doc/qtcreatordev/images/firstplugin-summary.png similarity index 100% rename from doc/api/images/firstplugin-summary.png rename to doc/qtcreatordev/images/firstplugin-summary.png diff --git a/doc/api/images/firstplugin-wizard.png b/doc/qtcreatordev/images/firstplugin-wizard.png similarity index 100% rename from doc/api/images/firstplugin-wizard.png rename to doc/qtcreatordev/images/firstplugin-wizard.png diff --git a/doc/api/images/riot.png b/doc/qtcreatordev/images/riot.png similarity index 100% rename from doc/api/images/riot.png rename to doc/qtcreatordev/images/riot.png diff --git a/doc/api/images/variablechooser.png b/doc/qtcreatordev/images/variablechooser.png similarity index 100% rename from doc/api/images/variablechooser.png rename to doc/qtcreatordev/images/variablechooser.png diff --git a/doc/api/qtcreator-dev-online.qdocconf b/doc/qtcreatordev/qtcreator-dev-online.qdocconf similarity index 71% rename from doc/api/qtcreator-dev-online.qdocconf rename to doc/qtcreatordev/qtcreator-dev-online.qdocconf index bf7d6c02b48..c8c2ef29a9a 100644 --- a/doc/api/qtcreator-dev-online.qdocconf +++ b/doc/qtcreatordev/qtcreator-dev-online.qdocconf @@ -1,4 +1,4 @@ # Run qdoc from the directory that contains this file. -include(../config/qtcreator-developer.qdocconf) +include(config/qtcreator-developer.qdocconf) include($QT_INSTALL_DOCS/global/qt-html-templates-online.qdocconf) diff --git a/doc/api/qtcreator-dev.qdocconf b/doc/qtcreatordev/qtcreator-dev.qdocconf similarity index 71% rename from doc/api/qtcreator-dev.qdocconf rename to doc/qtcreatordev/qtcreator-dev.qdocconf index 016bd6450f6..4efb86e8747 100644 --- a/doc/api/qtcreator-dev.qdocconf +++ b/doc/qtcreatordev/qtcreator-dev.qdocconf @@ -1,3 +1,3 @@ # Run qdoc from the directory that contains this file. -include(../config/qtcreator-developer.qdocconf) +include(config/qtcreator-developer.qdocconf) include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) diff --git a/doc/api/coding-style.qdoc b/doc/qtcreatordev/src/coding-style.qdoc similarity index 100% rename from doc/api/coding-style.qdoc rename to doc/qtcreatordev/src/coding-style.qdoc diff --git a/doc/api/creating-plugins.qdoc b/doc/qtcreatordev/src/creating-plugins.qdoc similarity index 100% rename from doc/api/creating-plugins.qdoc rename to doc/qtcreatordev/src/creating-plugins.qdoc diff --git a/doc/api/external-tool-spec.qdoc b/doc/qtcreatordev/src/external-tool-spec.qdoc similarity index 100% rename from doc/api/external-tool-spec.qdoc rename to doc/qtcreatordev/src/external-tool-spec.qdoc diff --git a/doc/api/first-plugin.qdoc b/doc/qtcreatordev/src/first-plugin.qdoc similarity index 100% rename from doc/api/first-plugin.qdoc rename to doc/qtcreatordev/src/first-plugin.qdoc diff --git a/doc/api/getting-and-building.qdoc b/doc/qtcreatordev/src/getting-and-building.qdoc similarity index 100% rename from doc/api/getting-and-building.qdoc rename to doc/qtcreatordev/src/getting-and-building.qdoc diff --git a/doc/api/plugin-lifecycle.qdoc b/doc/qtcreatordev/src/plugin-lifecycle.qdoc similarity index 100% rename from doc/api/plugin-lifecycle.qdoc rename to doc/qtcreatordev/src/plugin-lifecycle.qdoc diff --git a/doc/api/plugin-metadata.qdoc b/doc/qtcreatordev/src/plugin-metadata.qdoc similarity index 100% rename from doc/api/plugin-metadata.qdoc rename to doc/qtcreatordev/src/plugin-metadata.qdoc diff --git a/doc/api/pluginmanager.qdoc b/doc/qtcreatordev/src/pluginmanager.qdoc similarity index 100% rename from doc/api/pluginmanager.qdoc rename to doc/qtcreatordev/src/pluginmanager.qdoc diff --git a/doc/api/qtcreator-api.qdoc b/doc/qtcreatordev/src/qtcreator-api.qdoc similarity index 100% rename from doc/api/qtcreator-api.qdoc rename to doc/qtcreatordev/src/qtcreator-api.qdoc diff --git a/doc/api/qtcreator-dev-wizards.qdoc b/doc/qtcreatordev/src/qtcreator-dev-wizards.qdoc similarity index 100% rename from doc/api/qtcreator-dev-wizards.qdoc rename to doc/qtcreatordev/src/qtcreator-dev-wizards.qdoc diff --git a/doc/api/qtcreator-dev.qdoc b/doc/qtcreatordev/src/qtcreator-dev.qdoc similarity index 100% rename from doc/api/qtcreator-dev.qdoc rename to doc/qtcreatordev/src/qtcreator-dev.qdoc diff --git a/doc/api/qtcreator-documentation.qdoc b/doc/qtcreatordev/src/qtcreator-documentation.qdoc similarity index 100% rename from doc/api/qtcreator-documentation.qdoc rename to doc/qtcreatordev/src/qtcreator-documentation.qdoc diff --git a/doc/api/qtcreator-ui-text.qdoc b/doc/qtcreatordev/src/qtcreator-ui-text.qdoc similarity index 100% rename from doc/api/qtcreator-ui-text.qdoc rename to doc/qtcreatordev/src/qtcreator-ui-text.qdoc diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf index c27a7448982..0574bbed10b 100644 --- a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf +++ b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf @@ -7,12 +7,12 @@ moduleheader = headerdirs = sourcedirs = ../src \ ../examples/doc \ - ../../src + ../../qtcreator/src # The image folders also need to added by packaging scripts, so inform your # local release team about any changes you make. imagedirs = ../images \ ../examples/doc/images \ - ../../images \ + ../../qtcreator/images \ ../../../plugins/qmldesigner/qmlpreviewplugin/images \ ../../../share/qtcreator/qml/qmlpuppet/mockfiles/images \ ../../../share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images \ @@ -29,32 +29,32 @@ imagedirs = ../images \ ../../../src/plugins/qmldesigner/qmlpreviewplugin/images \ ../../../src/plugins/texteditor/images -excludefiles += ../../src/qtcreator.qdoc \ - ../../src/qtcreator-toc.qdoc +excludefiles += ../../qtcreator/src/qtcreator.qdoc \ + ../../qtcreator/src/qtcreator-toc.qdoc -excludedirs += ../../examples/accelbubble \ - ../../examples/textfinder \ - ../../examples/transitions \ - ../../src/analyze \ - ../../src/android \ - ../../src/baremetal \ - ../../src/cmake \ - ../../src/debugger/creator-only \ - ../../src/editors/creator-only \ - ../../src/howto/creator-only \ - ../../src/ios \ - ../../src/linux-mobile \ - ../../src/mcu \ - ../../src/overview/creator-only \ - ../../src/projects \ - ../../src/qnx \ - ../../src/qtquick/creator-only \ - ../../src/vcs/creator-only \ - ../../src/widgets \ - ../../src/webassembly +excludedirs += ../../qtcreator/examples/accelbubble \ + ../../qtcreator/examples/textfinder \ + ../../qtcreator/examples/transitions \ + ../../qtcreator/src/analyze \ + ../../qtcreator/src/android \ + ../../qtcreator/src/baremetal \ + ../../qtcreator/src/cmake \ + ../../qtcreator/src/debugger/creator-only \ + ../../qtcreator/src/editors/creator-only \ + ../../qtcreator/src/howto/creator-only \ + ../../qtcreator/src/ios \ + ../../qtcreator/src/linux-mobile \ + ../../qtcreator/src/mcu \ + ../../qtcreator/src/overview/creator-only \ + ../../qtcreator/src/projects \ + ../../qtcreator/src/qnx \ + ../../qtcreator/src/qtquick/creator-only \ + ../../qtcreator/src/vcs/creator-only \ + ../../qtcreator/src/widgets \ + ../../qtcreator/src/webassembly exampledirs = ../examples/ \ - ../../examples + ../../qtcreator/examples examples.fileextensions += *.qml *.svg *.ts *.qm HTML.extraimages = ../../config/images/commercial.png