diff --git a/doc/qtcreator/images/qtcreator-breakdown.png b/doc/qtcreator/images/qtcreator-breakdown.png index f8f789150b4..ed8f49af7e0 100644 Binary files a/doc/qtcreator/images/qtcreator-breakdown.png and b/doc/qtcreator/images/qtcreator-breakdown.png differ diff --git a/doc/qtcreator/src/howto/creator-ui.qdoc b/doc/qtcreator/src/howto/creator-ui.qdoc index 2f48f433f57..61de8f5dc72 100644 --- a/doc/qtcreator/src/howto/creator-ui.qdoc +++ b/doc/qtcreator/src/howto/creator-ui.qdoc @@ -56,6 +56,7 @@ \if defined(qtcreator) \li Browse Qt extensions in the \l{https://marketplace.qt.io/} {Qt Marketplace} + \li Download the Qt Installer \endif \li Read news from the online community and Qt blogs diff --git a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc index f86ce3c3194..e5c80b861e9 100644 --- a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc +++ b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 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. @@ -76,8 +76,8 @@ \section2 MCU Plugin To be able to develop applications for MCUs, you need the MCU plugin. - This plugin is enabled automatically by the Qt online installer when - you install the Qt for MCUs SDK. + This plugin is enabled automatically by the Qt Installer when you + install Qt for MCUs. \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 9b233bb3bf4..780c5165bdc 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc @@ -56,15 +56,16 @@ \section1 Checking Build and Run Settings \QC is an integrated development environment (IDE) that you can use to - develop Qt applications. While Qt installers typically install \QC, - stand-alone \QC installers never install Qt or any Qt tools, such as qmake. - To use \QC for Qt development, you also need to have a Qt version and a - compiler installed. + develop Qt applications. While you can use the Qt Installer 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 have a Qt version + and a compiler installed. If you update the compiler version later, you + can register it into \QC. - Qt installers, such as SDKs, often attempt to auto-detect the installed - compilers and Qt versions. If they succeed, the relevant kits will - automatically become available in \QC. If they do not, you must add the kits - yourself to tell \QC where everything is. + The Qt Installer attempts to auto-detect the installed 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. To add kits, select \uicontrol Tools > \uicontrol Options > \uicontrol Kits > \uicontrol Add. 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 357d41ff739..17995bffb15 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 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. @@ -42,9 +42,9 @@ 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 are registered by your system - or by an installer and lists them in \uicontrol Tools > \uicontrol Options > - \uicontrol Kits > \uicontrol Compilers: + \QC automatically detects the compilers that are registered by your + system or by the Qt Installer and lists them in \uicontrol Tools > + \uicontrol Options > \uicontrol Kits > \uicontrol Compilers: \image qtcreator-toolchains.png @@ -59,8 +59,8 @@ \li \MinGW (Minimalist GNU for Windows) is a native software port of GCC and GNU Binutils for use in the development of native Microsoft - Windows applications on Windows. \MinGW is - distributed together with \QC and Qt installers for Windows. + Windows applications on Windows. \MinGW is distributed together with + \QC and Qt for Windows. \li ICC (Intel C++ Compiler) is a group of C and C++ compilers. Only the GCC-compatible variant, available for Linux and \macos, 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 136fc3bda7c..82e007c2ea5 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 @@ -43,8 +43,8 @@ \section1 Registering Installed Qt Versions - \QC automatically detects the Qt versions that are registered by - your system or by installers. To view detailed information for each Qt + \QC automatically detects the Qt versions that are registered by your + system or by the Qt Installer. To view detailed information for each Qt version, select it in the list and select \uicontrol Details in the \uicontrol {Qt version for} section. @@ -137,7 +137,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 the Qt maintenance tool to check for updates or to reinstall the Qt version. \section1 Minimum Requirements diff --git a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc index 8e5c88246bb..1e2fdc17571 100644 --- a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc +++ b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc @@ -65,8 +65,8 @@ \section1 Setting Up the Development Environment You need to install and configure Qt for WebAssembly and the tool chain for - compiling to WebAssembly. The installer automatically adds a build and run - kit to \QC. + compiling to WebAssembly. The Qt Installer automatically adds a build and + run kit to \QC. \section2 Setting Up Qt for WebAssembly diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc index 4a11c64fc14..7d3509a0060 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc @@ -37,10 +37,10 @@ the 3D graphics tools to save the assets in widely-used 3D graphics formats, and then use \QB to import them into \QDS. - You can use the Qt online installer to install \QB if you have a commercial + You can use the Qt Installer to install \QB if you have a commercial \QDS license. You can also purchase a \QB license separately from the \l{https://marketplace.qt.io/}{Qt Marketplace} and then install \QB using - the Qt online installer. + the Qt Installer. For best results when importing assets, follow the guidelines for creating and exporting them. diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc index a87e0efe71e..cc2d2ee42e8 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc @@ -31,7 +31,7 @@ \title Setting Up \QBPS You can purchase a \QBPS license from the \l{https://marketplace.qt.io/} - {Qt Marketplace}, and then use the Qt online installer to have the \QBPS + {Qt Marketplace}, and then use the Qt Installer to have the \QBPS installation package copied to the following path in your Qt installation folder: \c {QtDesignStudio\photoshop_bridge}. diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc index bb5d83186bf..f8627c5730e 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc @@ -31,7 +31,7 @@ \title Setting Up \QBSK You can purchase a \QBSK license from the \l{https://marketplace.qt.io/} - {Qt Marketplace}, and then use the Qt online installer to have the \QBSK + {Qt Marketplace}, and then use the Qt Installer to have the \QBSK plugin package copied to the following path in your Qt installation folder: \c {QtDesignStudio\sketch_bridge\io.qt.qtbridge.sketchplugin}.