From e1c9720c09169c3d95fa4e95e9833dafab1ba110 Mon Sep 17 00:00:00 2001 From: Pranta Dastider Date: Mon, 4 Mar 2024 16:36:28 +0100 Subject: [PATCH] QmlDesigner: Create a document to list Qt runtime versions Qt Design Studio uses a specific Qt Runtime version to run the projects. This document lists the Qt runtime versions used for different Qt Design Studio releases. Fixes: QDS-12052 Change-Id: Ia9411393db4d800945c85ac67e4a9872a611308c Reviewed-by: Johanna Vanhatapio Reviewed-by: Thomas Hartmann --- .../qtquick/qtquick-modules-with-plugins.qdoc | 4 +- doc/qtcreator/src/vcs/creator-vcs-git.qdoc | 2 +- .../doc/images/studio-qt-development-kit.webp | Bin 2460 -> 2376 bytes .../src/qtdesignstudio-developer-topics.qdoc | 7 +++- ...signstudio-finding-qt-runtime-version.qdoc | 38 ++++++++++++++++++ .../qtdesignstudio-qt-runtime-version.qdocinc | 10 +++++ .../src/qtdesignstudio-toc.qdoc | 1 + 7 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 doc/qtdesignstudio/src/qtdesignstudio-finding-qt-runtime-version.qdoc create mode 100644 doc/qtdesignstudio/src/qtdesignstudio-qt-runtime-version.qdocinc 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 ab791bfc0b676901601828e130e2e0688c989851..f6613be35ecff0c10376cc90bfa3aad666478cc0 100644 GIT binary patch delta 2035 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 O3z%VS2F1yJ9J>Gy>+aG3 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}