diff --git a/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc b/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc index 97cf62bc015..299bd057720 100644 --- a/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc @@ -120,9 +120,7 @@ the emulation layer must be built with the same Qt version and compiler as the QML modules. - In \QDS, find the Qt version in the bottom toolbar next to - \inlineimage icons/settings.png. - \image studio-qt-development-kit.webp + \include qtdesignstudio-qt-runtime-version.qdocinc qt-runtime-version A plugin should behave differently depending on whether it is run by the emulation layer or an application. For example, animations should not be run diff --git a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc index 0b0cbb0ee20..b9a785fa908 100644 --- a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc +++ b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc @@ -10,7 +10,7 @@ /*! \page creator-vcs-git.html \if defined(qtdesignstudio) - \previouspage studio-developer-topics.html + \previouspage studio-finding-the-qt-runtime-version.html \nextpage studio-porting-projects.html \title Using Git diff --git a/doc/qtdesignstudio/examples/doc/images/studio-qt-development-kit.webp b/doc/qtdesignstudio/examples/doc/images/studio-qt-development-kit.webp index ab791bfc0b6..f6613be35ec 100644 Binary files a/doc/qtdesignstudio/examples/doc/images/studio-qt-development-kit.webp and b/doc/qtdesignstudio/examples/doc/images/studio-qt-development-kit.webp differ diff --git a/doc/qtdesignstudio/src/qtdesignstudio-developer-topics.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-developer-topics.qdoc index 7a96a9a41e4..bc99a9c2c0d 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-developer-topics.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-developer-topics.qdoc @@ -4,7 +4,7 @@ /*! \previouspage studio-packaging.html \page studio-developer-topics.html - \nextpage creator-vcs-git.html + \nextpage studio-finding-the-qt-runtime-version.html \title Developer Topics @@ -17,6 +17,11 @@ \endtable \list + \li \l{Finding the Qt Runtime Version} + + \QDS runs projects using a specific version of Qt. Identify + which version of Qt your \QDS uses. + \li \l{Using Git} You can add the project files to the Git version control, so that diff --git a/doc/qtdesignstudio/src/qtdesignstudio-finding-qt-runtime-version.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-finding-qt-runtime-version.qdoc new file mode 100644 index 00000000000..cb9c7e86e99 --- /dev/null +++ b/doc/qtdesignstudio/src/qtdesignstudio-finding-qt-runtime-version.qdoc @@ -0,0 +1,38 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + \previouspage studio-developer-topics.html + \page studio-finding-the-qt-runtime-version.html + \nextpage creator-vcs-git.html + + \title Finding the Qt Runtime Version + + \include qtdesignstudio-qt-runtime-version.qdocinc qt-runtime-version + + Find Qt runtime versions for previous \QDS releases in the table below. + + \table + \header + \li \QDS + \li Qt Runtime Version + \row + \li 4.0 + \li 6.4.1 and 5.15.5 + \row + \li 4.1 + \li 6.5.1 + \row + \li 4.2 + \li 6.5.1 + \row + \li 4.3 + \li 6.5.2 + \row + \li 4.3.2 + \li 6.6.0 + \row + \li 4.4 + \li 6.6.2 + \endtable +*/ diff --git a/doc/qtdesignstudio/src/qtdesignstudio-qt-runtime-version.qdocinc b/doc/qtdesignstudio/src/qtdesignstudio-qt-runtime-version.qdocinc new file mode 100644 index 00000000000..fb74f9180db --- /dev/null +++ b/doc/qtdesignstudio/src/qtdesignstudio-qt-runtime-version.qdocinc @@ -0,0 +1,10 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +//! [qt-runtime-version] + \QDS runs projects using a specific version of Qt. + In \QDS, find the Qt runtime version in the bottom toolbar. + + \image studio-qt-development-kit.webp +//! [qt-runtime-version] +*/ diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc index c2109082982..e1c7b4733e3 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc @@ -253,6 +253,7 @@ \endlist \li \l{Developer Topics} \list + \li \l{Finding the Qt Runtime Version} \li \l{Using Git} \li \l{Converting Qt 5 Projects into Qt 6 Projects} \li \l{Converting UI Projects to Applications}