diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc index 4b2a30a93af..62e8e2ee8e3 100644 --- a/doc/qtcreator/src/user-interface/creator-ui.qdoc +++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc @@ -32,7 +32,7 @@ /*! \page creator-quick-tour.html \if defined(qtdesignstudio) - \previouspage exporting-from-qt3ds.html + \previouspage studio-installation.html \else \previouspage creator-overview.html \endif diff --git a/doc/qtdesignstudio/images/studio-installation.png b/doc/qtdesignstudio/images/studio-installation.png new file mode 100644 index 00000000000..e3af24d70c1 Binary files /dev/null and b/doc/qtdesignstudio/images/studio-installation.png differ diff --git a/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc index b1bc8b47395..d2ff8969dc0 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc @@ -26,7 +26,7 @@ /*! \previouspage index.html \page studio-getting-started.html - \nextpage studio-exporting-and-importing.html + \nextpage studio-installation.html \title Getting Started @@ -34,6 +34,10 @@ with \QDS: \list + \li \l {Installation} + + \QDS is available either as a standalone installation package or + as an option in the Qt online installer. \li \l {Exporting and Importing} Describes how to export designs containing 2D and 3D assets into diff --git a/doc/qtdesignstudio/src/qtdesignstudio-installation.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-installation.qdoc new file mode 100644 index 00000000000..679718dcccd --- /dev/null +++ b/doc/qtdesignstudio/src/qtdesignstudio-installation.qdoc @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Design Studio. +** +** 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. +** +****************************************************************************/ + +/*! + \page studio-installation.html + \previouspage studio-getting-started.html + \nextpage creator-quick-tour.html + + \title Installation + + You can install \QDS either using a stand-alone installation package or the + Qt online installer. The installers copy all the modules and tools you need + to design UIs and preview them on the desktop to your computer and configure + them for you. + + To begin, create a \l{Qt Account}. This account gives you access to a web + portal to manage your licenses and download the standalone \QDS package or + the Qt online installer. Alternatively, you can download an evaluation + package \l{https://www.qt.io/product/ui-design-tools}{here}. + + After the installation, you can start exploring \QDS by opening + \l{Examples and Tutorials}{examples}, following \l{Tutorials}{tutorials}, + watching videos, and reading this manual. + + \section1 Stand-Alone Installation + + You can download the \QDS installer for your operating system (\macos, + Linux, or Windows) from your Qt Account. Start the installation as you + would for any other software, and follow the instructions of the + installer to complete it. + + \section1 Using Qt Online Installer + + You can download the Qt online installer for your operating system + from your Qt Account. + + \list 1 + \li Start the Qt online installer. + \li Select \uicontrol {Design Tools}. + \image studio-installation.png "Design Tools selected in Qt online installer" + \li Select \uicontrol Next and follow the instructions of the + installer to complete the installation. + \endlist + + For more information about the installation process, see + \l{Getting Started with Qt}. +*/ diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc index d7226799d63..0b0c1e2d85f 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc @@ -28,9 +28,9 @@ \title All Topics \list - \li \l{Getting Started} (REWRITE) + \li \l{Getting Started} \list - \li \l Installation (NEW) + \li \l{Installation} \li \l{User Interface}{Interface Overview} \list \li \l{Selecting Modes} diff --git a/doc/qtdesignstudio/src/qtdesignstudio.qdoc b/doc/qtdesignstudio/src/qtdesignstudio.qdoc index ea56d5efcea..de7938e89fb 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio.qdoc @@ -45,9 +45,9 @@ \li \inlineimage studio-3d-scenes.png \li \inlineimage studio-animation.png \row - \li \b {\l{Getting Started}} (REWRITE) + \li \b {\l{Getting Started}} \list - \li \l Installation + \li \l{Installation} \li \l{User Interface}{Interface Overview} \li \l{Creating Projects}{Projects} \li \l{Use Cases} (NEW)