Doc: Show "Managing Sessions" topic in QDS Manual

- Moved the topic from the creator-only folder to the
  howto folder root to have it included in the doc builds.
- Added the topic to the toc and fixed the navigation links
  around it.
- Used defines to hide text that does not apply to QDS.

Fixes: QDS-2805
Change-Id: I583324a1d0bc60c1b6448a52e48b3f09b1039b7f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Leena Miettinen
2020-09-21 09:00:58 +02:00
parent 71e2138517
commit 49d20960b9
4 changed files with 16 additions and 5 deletions

View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2018 The Qt Company Ltd. ** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Creator documentation. ** 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 \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 \nextpage creator-design-mode.html
\endif
\title Managing Sessions \title Managing Sessions
@@ -46,7 +51,10 @@
\list \list
\li Projects with their dependencies (including SUBDIRS projects) \li Projects
\if defined(qtcreator)
with their dependencies (including SUBDIRS projects)
\endif
\li Editors \li Editors
@@ -91,6 +99,7 @@
To switch between sessions, select \uicontrol {Switch To}. To switch between sessions, select \uicontrol {Switch To}.
\if defined(qtcreator)
When you launch \QC, a list of existing sessions is displayed in the When you launch \QC, a list of existing sessions is displayed in the
\uicontrol Welcome mode. To open a session, select it or press \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 \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. a session as argument and \QC will start with this session.
For more information, see \l{Using Command Line Options}. For more information, see \l{Using Command Line Options}.
\endif
*/ */

View File

@@ -27,7 +27,7 @@
\page creator-project-managing-workspaces.html \page creator-project-managing-workspaces.html
\if defined(qtdesignstudio) \if defined(qtdesignstudio)
\previouspage creator-using-qt-quick-designer.html \previouspage creator-using-qt-quick-designer.html
\nextpage {Tutorials} \nextpage creator-project-managing-sessions.html
\else \else
\previouspage creator-sidebars.html \previouspage creator-sidebars.html
\nextpage creator-output-panes.html \nextpage creator-output-panes.html

View File

@@ -55,6 +55,7 @@
\li \l{Editing QML Files in Design Mode} \li \l{Editing QML Files in Design Mode}
\list \list
\li \l{Managing Workspaces} \li \l{Managing Workspaces}
\li \l{Managing Sessions}
\endlist \endlist
\li \l{Tutorials} \li \l{Tutorials}
\endlist \endlist

View File

@@ -24,8 +24,8 @@
****************************************************************************/ ****************************************************************************/
/*! /*!
\previouspage creator-project-managing-workspaces.html
\group gstutorials \group gstutorials
\previouspage creator-project-managing-sessions.html
\nextpage studio-projects-managing.html \nextpage studio-projects-managing.html
\title Tutorials \title Tutorials