From 5f23a07ba76052d511a795278e1a5c7c2bd9e3d6 Mon Sep 17 00:00:00 2001 From: Pranta Dastider Date: Wed, 22 May 2024 17:18:14 +0200 Subject: [PATCH] QmlDesigner: Update Qt Academy course links in documents This patch adds some of the Qt Academy course links in the relevant documents. Fixes: QDS-12747 Change-Id: I8309681869922be3277e775c312ffa1210d64a29 Reviewed-by: Jaishree Vyas --- doc/config/macros.qdocconf | 1 + .../src/qtbridge/qtbridge-figma-overview.qdoc | 6 ++++- .../src/qtbridge/qtbridge-figma-setup.qdoc | 4 +++- .../src/qtbridge/qtbridge-figma-using.qdoc | 4 +++- .../src/qtdesignstudio-getting-started.qdoc | 4 +++- .../src/qtdesignstudio-qt-academy.qdocinc | 22 +++++++++++++++++++ .../qtdesignstudio-3d-editor.qdoc | 4 +++- 7 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 doc/qtdesignstudio/src/qtdesignstudio-qt-academy.qdocinc diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf index f86590735b6..46e4e0b20c2 100644 --- a/doc/config/macros.qdocconf +++ b/doc/config/macros.qdocconf @@ -18,6 +18,7 @@ macro.oslash.HTML = "ø" macro.ouml.HTML = "ö" macro.Q3DS = "Qt 3D Studio" macro.QA = "Qt Assistant" +macro.QAC = "Qt Academy" macro.QB = "Qt Bridge" macro.QBPS = "Qt Bridge for Adobe Photoshop" macro.QBXD = "Qt Bridge for Adobe XD" diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-overview.qdoc index b721acfa9e3..798ca9551c6 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-overview.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-overview.qdoc @@ -1,4 +1,4 @@ -// Copyright (C) 2020 The Qt Company Ltd. +// Copyright (C) 2024 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only // Note: The \page value is hard-coded as a link in Qt Bridge for Figma. @@ -29,5 +29,9 @@ To get the best results when you use \QBF to export designs from Figma, you should follow the guidelines for working with Figma and organizing your assets. + \endlist + + \include qtdesignstudio-qt-academy.qdocinc qt-academy-using-qt-bridge-for-figma + */ diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-setup.qdoc index 33d130f3360..00e9586df25 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-setup.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-setup.qdoc @@ -1,4 +1,4 @@ -// Copyright (C) 2020 The Qt Company Ltd. +// Copyright (C) 2024 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! @@ -25,4 +25,6 @@ \endlist You can launch the installed Figma plugin from \uicontrol Plugins > \uicontrol {\QBF} in Figma. + + \include qtdesignstudio-qt-academy.qdocinc qt-academy-using-qt-bridge-for-figma */ diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-using.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-using.qdoc index b189500f491..22cc72105e7 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-using.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-using.qdoc @@ -1,4 +1,4 @@ -// Copyright (C) 2021 The Qt Company Ltd. +// Copyright (C) 2024 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! @@ -247,4 +247,6 @@ \uicontrol Home tab) to default values. This means that you will lose all your changes to the settings. \endtable + + \include qtdesignstudio-qt-academy.qdocinc qt-academy-using-qt-bridge-for-figma */ diff --git a/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc index 493242254f8..a975dfe7fc6 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc @@ -1,4 +1,4 @@ -// Copyright (C) 2021 The Qt Company Ltd. +// Copyright (C) 2024 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! @@ -56,4 +56,6 @@ If you would rather be shown things than read about them, you can watch our extensive video tutorials. \endlist + + \include qtdesignstudio-qt-academy.qdocinc qt-academy-getting-started-with-qt-design-studio */ diff --git a/doc/qtdesignstudio/src/qtdesignstudio-qt-academy.qdocinc b/doc/qtdesignstudio/src/qtdesignstudio-qt-academy.qdocinc new file mode 100644 index 00000000000..3769ddc5e34 --- /dev/null +++ b/doc/qtdesignstudio/src/qtdesignstudio-qt-academy.qdocinc @@ -0,0 +1,22 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +//! [qt-academy-using-qt-bridge-for-figma] + To learn the basics of \QBF, take the + \l {https://www.qt.io/academy/course-catalog#how-to-use-qt-bridge-for-figma} + {How to Use \QBF} course in \QAC. +//! [qt-academy-using-qt-bridge-for-figma] + +//! [qt-academy-3D-with-qt-design-studio] + To learn the basics of using 3D in \QDS, take the + \l {https://www.qt.io/academy/course-catalog#3d-with-qt-design-studio} + {3D with \QDS} course in \QAC. +//! [qt-academy-3D-with-qt-design-studio] + +//! [qt-academy-getting-started-with-qt-design-studio] + To learn the basics of using \QDS, take the + \l {https://www.qt.io/academy/course-catalog#getting-started-with-qt-design-studio} + {Getting Started with \QDS} course in \QAC. +//! [qt-academy-getting-started-with-qt-design-studio] + +*/ diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc index aba12f38c1e..e691b47c770 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc @@ -47,7 +47,9 @@ \youtube SsFWyUeAA_4 - \section1 Usingn the Context Menu in the 3D View + \include qtdesignstudio-qt-academy.qdocinc qt-academy-3D-with-qt-design-studio + + \section1 Using the Context Menu in the 3D View There is a context menu in the \uicontrol 3D view. To open it, right-click in the \uicontrol 3D view. From the context menu you can, for example: