diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf index 1024ddc0278..f806b1dff18 100644 --- a/doc/config/macros.qdocconf +++ b/doc/config/macros.qdocconf @@ -35,6 +35,8 @@ macro.QMLD = "Qt Quick Designer" macro.QQV = "Qt QML Viewer" macro.QSDK = "Qt" macro.QUL = "Qt Quick Ultralite" +macro.QOI = "Qt Online Installer" +macro.QMT = "Qt Maintenance Tool" macro.qtcversion = $QTC_VERSION macro.param = "\\e" macro.raisedaster.HTML = "*" diff --git a/doc/qtcreator/src/conan/creator-projects-conan.qdoc b/doc/qtcreator/src/conan/creator-projects-conan.qdoc index 905e486c9ea..d91ce1cc575 100644 --- a/doc/qtcreator/src/conan/creator-projects-conan.qdoc +++ b/doc/qtcreator/src/conan/creator-projects-conan.qdoc @@ -28,7 +28,7 @@ sources. Because the client has a local cache for package storage, you can work offline, as long as no new packages are needed from remote servers. - To use Conan, install it by using the Qt installer or the tools that + To use Conan, install it by using \QOI or the tools that your operating system has. For example, on Windows, you can use the \c {choco install conan} or \c {pip install conan} command. diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc index d457abc4f97..8c2c61a413a 100644 --- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc +++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc @@ -169,7 +169,7 @@ \section2 Debugging Tools for Windows To use the CDB debugger, install the \e {Debugging Tools for Windows} when - you install \QC either by using the Qt Online Installer (in \uicontrol Qt + you install \QC either by using \QOI (in \uicontrol Qt > \uicontrol Tools > \uicontrol {\QC}) or by using the stand-alone \QC installation packages. diff --git a/doc/qtcreator/src/howto/creator-telemetry.qdoc b/doc/qtcreator/src/howto/creator-telemetry.qdoc index 959887080c4..b3cad6bf004 100644 --- a/doc/qtcreator/src/howto/creator-telemetry.qdoc +++ b/doc/qtcreator/src/howto/creator-telemetry.qdoc @@ -77,7 +77,7 @@ The data is transmitted to the backend storage using an encrypted connection. The storage is located in the same Heroku backend as the - Qt installer backend. Physically, data is stored in the Amazon cloud. + \QOI backend. Physically, data is stored in the Amazon cloud. \section1 Specifying Telemetry Settings diff --git a/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc b/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc index 8f7a7378392..51746e8f901 100644 --- a/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc +++ b/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc @@ -19,10 +19,10 @@ \endlist You must install the tool chain for building applications for the targeted - embedded platform on the development PC and use the Qt Maintenance Tool to + embedded platform on the development PC and use \QMT to install Qt libraries that are built for the platform. You can then add a \l{glossary-buildandrun-kit}{kit} with the tool chain and the Qt version - for the device's architecture. When possible, the Maintenance Tool creates + for the device's architecture. When possible, \QMT creates suitable kits for you. You can connect embedded devices to the development PC to run, debug, and diff --git a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc index 012a5d5e2eb..f2ad72b6402 100644 --- a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc +++ b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc @@ -54,7 +54,7 @@ \section2 MCU Plugin To be able to develop applications for MCUs, you need the MCU plugin. - This plugin is enabled automatically by the Qt Installer when you + This plugin is enabled automatically by \QOI when you install \QMCU. \section2 Specifying MCU Settings diff --git a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc index 95906339121..456777f1542 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc @@ -34,13 +34,13 @@ \section1 Checking Build and Run Settings \QC is an integrated development environment (IDE) that you can use to - develop Qt applications. While you can use the Qt Installer to install \QC, + develop Qt applications. While you can use \QOI to install \QC, the stand-alone \QC installer never installs Qt or any Qt tools, such as qmake. To use \QC for Qt development, you also need to install a Qt version and a compiler. If you update the compiler version later, you can register it into \QC. - The Qt Installer attempts to auto-detect compilers and Qt versions. If it + \QOI attempts to auto-detect compilers and Qt versions. If it succeeds, the relevant kits will automatically become available in \QC. If it does not, you must add the kits yourself to tell \QC where everything is. diff --git a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc index a7ae08afbac..c6da02cd9c7 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc @@ -46,8 +46,8 @@ \row \li \b {\l{Building and Running an Example}} - To check that the \l{https://www.qt.io/download-qt-installer} - {Qt Online Installer} created \l{glossary-buildandrun-kit} + To check that \l{https://www.qt.io/download-qt-installer} + {\QOI} created \l{glossary-buildandrun-kit} {build and run kits}, open an example application and run it. If you have not done so before, go to \l{Building and Running an Example}. diff --git a/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc b/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc index c6d689547b6..58ad65844ac 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc @@ -16,10 +16,10 @@ \endlist You must install the tool chain for building applications for the targeted - mobile platform on the development PC and use the Qt Maintenance Tool to + mobile platform on the development PC and use \QMT to install Qt libraries that are built for the platform. You can then add a \l{glossary-buildandrun-kit}{kit} with the tool chain and the Qt version - for the device's architecture. When possible, the Maintenance Tool creates + for the device's architecture. When possible, \QMT creates suitable kits for you. You can connect mobile devices to the development PC and select the diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc index 525e4e2f04d..b156fef7ac0 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc @@ -20,7 +20,7 @@ specifies the compiler and other necessary tools for building an application for and running it on a particular platform. - \QC automatically detects the compilers that your system or the Qt Installer + \QC automatically detects the compilers that your system or \QOI registers and lists them in \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits > \uicontrol Compilers. diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc index 9d3af4d82c7..8cddb9375eb 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc @@ -28,7 +28,7 @@ To remove invalid Qt versions, select \uicontrol {Clean Up}. - You can link to a Qt that the Qt Installer installed to + You can link to a Qt that \QOI installed to automatically detect the installed Qt versions. However, you cannot link to a Qt that the system installed with some other package manager, such as your Linux distribution, brew on \macos, or Chocolatey on @@ -112,7 +112,7 @@ output exist. When \QC complains about the installation of a self-built Qt version, try running \c {make install} in the build directory to actually install Qt into the configured location. If you installed Qt using the Qt - Installer, run the Qt maintenance tool to check for updates or to reinstall + Installer, run \QMT to check for updates or to reinstall the Qt version. \section1 Minimum Requirements diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc index fff52cf5707..0b27f1e9316 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc @@ -14,8 +14,8 @@ \title Configuring Projects - When you install Qt for a target platform, such as Android or QNX, the - \l{https://www.qt.io/download-qt-installer}{Qt Online Installer} + When you install Qt for a target platform, such as Android or QNX, + \l{https://www.qt.io/download-qt-installer}{\QOI} creates \l{glossary-buildandrun-kit}{kits} for the development targets. Select the kits to use in the \uicontrol {Configure Projects} view when you open a project for the first time. At least one kit must be diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc index 55458349642..9bc2c37c1ce 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc @@ -83,8 +83,8 @@ \note If you have not installed the Qt Virtual Keyboard module when you installed Qt, an error message will appear when you try to open - \e Main.qml for editing. You can use the \l {Installing Qt} - {Qt Maintenance Tool} to install Qt Virtual Keyboard. + \e Main.qml for editing. You can use \l {Installing Qt} + {\QMT} to install Qt Virtual Keyboard. \li Select \uicontrol Next to open the \uicontrol {Kit Selection} dialog. diff --git a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc index c05f84832e5..64f8cd0e75e 100644 --- a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc +++ b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc @@ -39,7 +39,7 @@ \section1 Setting Up the Development Environment You need to install and configure Qt for WebAssembly and the tool chain for - compiling to WebAssembly. The Qt Installer automatically adds a build and + compiling to WebAssembly. \QOI automatically adds a build and run kit to \QC. \section2 Setting Up Qt for WebAssembly @@ -47,7 +47,7 @@ To set up Qt for WebAssembly: \list 1 - \li Use the Qt maintenance tool to install Qt for WebAssembly and, on + \li Use \QMT to install Qt for WebAssembly and, on Windows, \MinGW (found in \uicontrol {Developer and Designer Tools}). \li Check out a known-good Emscripten version supported by the Qt for WebAssembly version that you installed, and install and activate diff --git a/doc/qtcreatordev/src/getting-and-building.qdoc b/doc/qtcreatordev/src/getting-and-building.qdoc index 7079e9f0558..5fe3b53f21e 100644 --- a/doc/qtcreatordev/src/getting-and-building.qdoc +++ b/doc/qtcreatordev/src/getting-and-building.qdoc @@ -44,9 +44,9 @@ When developing your plugin, point the \c {CMAKE_PREFIX_PATH} to the installation location of \QC, or the \QC app on macOS. - Get prebuilt packages either from the + Get prebuilt packages either from \l{https://download.qt.io/official_releases/online_installers/} - {Qt online installer}, or a standalone \QC installer either for a + {\QOI}, or a standalone \QC installer either for a \l{https://download.qt.io/official_releases/qtcreator/} {released \QC version} or a \l{https://download.qt.io/snapshots/qtcreator/} {development snapshot}. diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc index 560c8232d27..7c62a994f8a 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc @@ -21,7 +21,7 @@ \section1 2D Assets - You can use the Qt Installer to install \QB if you have a + You can use \QOI to install \QB if you have a \QDS enterprise license. \table diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc index e2e8e8f389e..864e12c9e47 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc @@ -10,7 +10,7 @@ \QBPS is included in the \l{https://www.qt.io/pricing}{Qt Design Studio Enterprise license}. - You can use the Qt Installer to have the \QBPS plugin package copied to the + You can use \QOI to have the \QBPS plugin package copied to the following path in your Qt installation folder: \list diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc index b3a8ac1e970..9fbccf11714 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc @@ -10,7 +10,7 @@ \QBSK is included in the \l{https://www.qt.io/pricing}{Qt Design Studio Enterprise license}. - You can use the Qt Installer to have the \QBSK plugin package copied to the + You can use \QOI to have the \QBSK plugin package copied to the following path in your Qt installation folder: \list diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-xd-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-xd-setup.qdoc index b542732e54a..392a3c1f7a3 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-xd-setup.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-xd-setup.qdoc @@ -10,7 +10,7 @@ \QBXD is included in the \l{https://www.qt.io/pricing}{Qt Design Studio Enterprise license}. - You can use the Qt Installer to have the \QBXD plugin package copied to the + You can use \QOI to have the \QBXD plugin package copied to the following path in your Qt installation folder: \list diff --git a/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc index 47800afab72..c10ee9d3304 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc @@ -24,7 +24,7 @@ \li \l {Installation} \QDS is available either as a standalone installation package or - as an option in the Qt online installer. + as an option in \QOI. \li \l {Tutorials} Follow a set of hands-on tutorials that illustrate how to use the diff --git a/doc/qtdesignstudio/src/qtdesignstudio-installation.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-installation.qdoc index 863e3cf818c..2ee66d9e15c 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-installation.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-installation.qdoc @@ -8,15 +8,15 @@ \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 + You can install \QDS either using a stand-alone installation package or \QOI. + 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. \QDS is available for Linux, \macOS, and Windows operating systems. For more information, see \l{Supported Platforms}. 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 + \QOI. 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 following @@ -31,15 +31,15 @@ would for any other software, and follow the instructions of the installer to complete it. - \section1 Using Qt Online Installer + \section1 Using \QOI - You can download the Qt online installer for your operating system + You can download \QOI for your operating system from your Qt Account. \list 1 - \li Start the Qt online installer. + \li Start \QOI. \li Select \uicontrol {Design Tools}. - \image studio-installation.png "Design Tools selected in Qt online installer" + \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