diff options
-rw-r--r-- | doc/qtcreator/src/howto/creator-sessions.qdoc (renamed from doc/qtcreator/src/howto/creator-only/creator-sessions.qdoc) | 16 | ||||
-rw-r--r-- | doc/qtcreator/src/howto/creator-workspaces.qdoc | 2 | ||||
-rw-r--r-- | doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc | 1 | ||||
-rw-r--r-- | doc/qtdesignstudio/src/qtdesignstudio-tutorials.qdoc | 2 |
4 files changed, 16 insertions, 5 deletions
diff --git a/doc/qtcreator/src/howto/creator-only/creator-sessions.qdoc b/doc/qtcreator/src/howto/creator-sessions.qdoc index e2c3816f86..7e74a9a259 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-sessions.qdoc +++ b/doc/qtcreator/src/howto/creator-sessions.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,9 +30,14 @@ // ********************************************************************** /*! - \previouspage creator-sharing-project-settings.html \page creator-project-managing-sessions.html + \if defined(qtdesignstudio) + \previouspage creator-project-managing-workspaces.html + \nextpage {Tutorials} + \else + \previouspage creator-sharing-project-settings.html \nextpage creator-design-mode.html + \endif \title Managing Sessions @@ -46,7 +51,10 @@ \list - \li Projects with their dependencies (including SUBDIRS projects) + \li Projects + \if defined(qtcreator) + with their dependencies (including SUBDIRS projects) + \endif \li Editors @@ -91,6 +99,7 @@ To switch between sessions, select \uicontrol {Switch To}. + \if defined(qtcreator) When you launch \QC, a list of existing sessions is displayed in the \uicontrol Welcome mode. To open a session, select it or press \key Ctrl+Alt+<number>, where \e <number> is the number of the session to @@ -109,5 +118,6 @@ a session as argument and \QC will start with this session. For more information, see \l{Using Command Line Options}. + \endif */ diff --git a/doc/qtcreator/src/howto/creator-workspaces.qdoc b/doc/qtcreator/src/howto/creator-workspaces.qdoc index d3e4809089..704a221e6b 100644 --- a/doc/qtcreator/src/howto/creator-workspaces.qdoc +++ b/doc/qtcreator/src/howto/creator-workspaces.qdoc @@ -27,7 +27,7 @@ \page creator-project-managing-workspaces.html \if defined(qtdesignstudio) \previouspage creator-using-qt-quick-designer.html - \nextpage {Tutorials} + \nextpage creator-project-managing-sessions.html \else \previouspage creator-sidebars.html \nextpage creator-output-panes.html diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc index a758f444d4..41fc8926cf 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc @@ -55,6 +55,7 @@ \li \l{Editing QML Files in Design Mode} \list \li \l{Managing Workspaces} + \li \l{Managing Sessions} \endlist \li \l{Tutorials} \endlist diff --git a/doc/qtdesignstudio/src/qtdesignstudio-tutorials.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-tutorials.qdoc index 6968e3f55e..9e35d32080 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-tutorials.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-tutorials.qdoc @@ -24,8 +24,8 @@ ****************************************************************************/ /*! - \previouspage creator-project-managing-workspaces.html \group gstutorials + \previouspage creator-project-managing-sessions.html \nextpage studio-projects-managing.html \title Tutorials |