From 1a84cdab84615f9e1c5da39819bc2b15cee3dcd5 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 25 Oct 2021 17:58:58 +0200 Subject: [PATCH] Doc: Hide ADS (workspaces) information from Qt Creator Manual ADS is used only in Qt Design Studio, even though the Debug mode also has "workspaces". Move the topic source file and image files to doc\qtdesignstudio\. Task-number: QTCREATORBUG-26321 Change-Id: I72b0011a6c8258df8a5e938f3f33d44c39ccfa4c Reviewed-by: Alessandro Portale Reviewed-by: Johanna Vanhatapio --- doc/qtcreator/src/qtcreator-toc.qdoc | 1 - .../user-interface/creator-open-documents-view.qdoc | 2 +- doc/qtcreator/src/user-interface/creator-ui.qdoc | 3 +-- doc/qtcreator/src/user-interface/creator-views.qdoc | 7 ++++++- .../images/qtcreator-workspace-attaching-views.png | Bin .../images/qtcreator-workspace-manager.png | Bin .../images/qtcreator-workspace-new.png | Bin .../src/views/studio-workspaces.qdoc} | 6 +----- 8 files changed, 9 insertions(+), 10 deletions(-) rename doc/{qtcreator => qtdesignstudio}/images/qtcreator-workspace-attaching-views.png (100%) rename doc/{qtcreator => qtdesignstudio}/images/qtcreator-workspace-manager.png (100%) rename doc/{qtcreator => qtdesignstudio}/images/qtcreator-workspace-new.png (100%) rename doc/{qtcreator/src/user-interface/creator-workspaces.qdoc => qtdesignstudio/src/views/studio-workspaces.qdoc} (95%) diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index c1ce9e2f2f5..f1e06156fd0 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -43,7 +43,6 @@ \li \l{File System} \li \l{Open Documents} \endlist - \li \l{Managing Workspaces} \li \l{Viewing Output} \endlist \li \l{Configuring Qt Creator} diff --git a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc index c64809d8f2b..261c3406136 100644 --- a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc @@ -26,7 +26,7 @@ /*! \page creator-open-documents-view.html \previouspage creator-file-system-view.html - \nextpage creator-project-managing-workspaces.html + \nextpage creator-output-panes.html \title Open Documents diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc index 7711dbd01f6..e2f31b0c787 100644 --- a/doc/qtcreator/src/user-interface/creator-ui.qdoc +++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc @@ -93,7 +93,6 @@ \li \l{Selecting Modes}{Mode selector} \li \l{Working with Sidebars}{Sidebars} \li \l{Browsing Project Contents}{Views} - \li \l{Managing Workspaces}{Workspaces} \li \l{Viewing Output}{Output panes} \endlist @@ -350,7 +349,7 @@ \previouspage creator-views.html \nextpage creator-highlighting.html \else - \previouspage creator-project-managing-workspaces.html + \previouspage creator-open-documents-view.html \nextpage creator-configuring.html \endif diff --git a/doc/qtcreator/src/user-interface/creator-views.qdoc b/doc/qtcreator/src/user-interface/creator-views.qdoc index 65e44a03a91..65d41d0bbf1 100644 --- a/doc/qtcreator/src/user-interface/creator-views.qdoc +++ b/doc/qtcreator/src/user-interface/creator-views.qdoc @@ -35,7 +35,12 @@ \title Browsing Project Contents You can organize \QC views in \l {Working with Sidebars}{sidebars} or as - \l {Managing Workspaces}{workspaces}, depending on the \l{Selecting Modes} + \if defined(qtdesignstudio) + \l {Managing Workspaces}{workspaces}, + \else + workspaces + \endif + depending on the \l{Selecting Modes} {mode} you are working in. Only views that are relevant to a mode are available in it. diff --git a/doc/qtcreator/images/qtcreator-workspace-attaching-views.png b/doc/qtdesignstudio/images/qtcreator-workspace-attaching-views.png similarity index 100% rename from doc/qtcreator/images/qtcreator-workspace-attaching-views.png rename to doc/qtdesignstudio/images/qtcreator-workspace-attaching-views.png diff --git a/doc/qtcreator/images/qtcreator-workspace-manager.png b/doc/qtdesignstudio/images/qtcreator-workspace-manager.png similarity index 100% rename from doc/qtcreator/images/qtcreator-workspace-manager.png rename to doc/qtdesignstudio/images/qtcreator-workspace-manager.png diff --git a/doc/qtcreator/images/qtcreator-workspace-new.png b/doc/qtdesignstudio/images/qtcreator-workspace-new.png similarity index 100% rename from doc/qtcreator/images/qtcreator-workspace-new.png rename to doc/qtdesignstudio/images/qtcreator-workspace-new.png diff --git a/doc/qtcreator/src/user-interface/creator-workspaces.qdoc b/doc/qtdesignstudio/src/views/studio-workspaces.qdoc similarity index 95% rename from doc/qtcreator/src/user-interface/creator-workspaces.qdoc rename to doc/qtdesignstudio/src/views/studio-workspaces.qdoc index 85a4fb78549..444aca6b81d 100644 --- a/doc/qtcreator/src/user-interface/creator-workspaces.qdoc +++ b/doc/qtdesignstudio/src/views/studio-workspaces.qdoc @@ -26,15 +26,11 @@ /*! \page creator-project-managing-workspaces.html \previouspage creator-open-documents-view.html - \if defined(qtdesignstudio) \nextpage creator-project-managing-sessions.html - \else - \nextpage creator-output-panes.html - \endif \title Managing Workspaces - In the Design and Debug modes, you can arrange a set of \QC + In the \uicontrol Design mode, you can arrange a set of \QC views as a \e workspace on the screen. To detach views: