diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf index 3b2970724b5..d2e02d06784 100644 --- a/doc/config/macros.qdocconf +++ b/doc/config/macros.qdocconf @@ -48,3 +48,17 @@ macro.beginfloatright.HTML = "
" macro.endfloat.HTML = "
" macro.clearfloat.HTML = "
" macro.emptyspan.HTML = "" + +# Embed YouTube content by video ID - Example: \youtube dQw4w9WgXcQ +# Also requires a .jpg thumbnail for offline docs. In .qdocconf, add: +# +# HTML.extraimages += images/dQw4w9WgXcQ.jpg +# qhp.ProjectName.extraFiles += images/dQw4w9WgXcQ.jpg +# +macro.youtube.HTML = "
\n\n" \ + "
\n" diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf index dec1878602a..26bdee56c23 100644 --- a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf +++ b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf @@ -69,8 +69,10 @@ exampledirs = ../examples/ \ ../../qtcreator/examples examples.fileextensions += *.qml *.svg *.ts *.qm -HTML.extraimages = ../../config/images/commercial.png -qhp.QtCreator.extraFiles = ../../config/images/commercial.png +{HTML.extraimages,qhp.qtdesignstudio.extraFiles} += ../../config/images/commercial.png \ + ../images/videoicons/9ihYeC0YJ0M.jpg \ + ../images/videoicons/aV6kFxH3Xws.jpg \ + ../images/videoicons/ZzbucmQPU44.jpg depends += qtwidgets \ qtcore \ diff --git a/doc/qtdesignstudio/images/videoicons/9ihYeC0YJ0M.jpg b/doc/qtdesignstudio/images/videoicons/9ihYeC0YJ0M.jpg new file mode 100644 index 00000000000..93ffdccbd7f Binary files /dev/null and b/doc/qtdesignstudio/images/videoicons/9ihYeC0YJ0M.jpg differ diff --git a/doc/qtdesignstudio/images/videoicons/ZzbucmQPU44.jpg b/doc/qtdesignstudio/images/videoicons/ZzbucmQPU44.jpg new file mode 100644 index 00000000000..dd25d4cea36 Binary files /dev/null and b/doc/qtdesignstudio/images/videoicons/ZzbucmQPU44.jpg differ diff --git a/doc/qtdesignstudio/images/videoicons/aV6kFxH3Xws.jpg b/doc/qtdesignstudio/images/videoicons/aV6kFxH3Xws.jpg new file mode 100644 index 00000000000..94b7e30392a Binary files /dev/null and b/doc/qtdesignstudio/images/videoicons/aV6kFxH3Xws.jpg differ diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc index 26eda08a083..5b0bab0e502 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc @@ -52,4 +52,6 @@ Photoshop, you should follow the guidelines for working with Photoshop and organizing your assets. \endlist + + \include qtbridge-tutorial-links.qdocinc qtpsbridge videos */ diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc index d9677906fbb..f643a5d20e9 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc @@ -249,15 +249,6 @@ In the \QBPS \uicontrol Settings dialog, select \uicontrol {Override JSX Script} to set the override JSX script. - For more information, watch a video tutorial and webinar about using \QBPS: - - \list - \li \l{https://resources.qt.io/development-topic-ui-design/qtdesignstudio-clustertutorial-partone} - {Building an Instrument Cluster for Your Car HMI, Part 1} - \li \l{https://www.youtube.com/watch?v=ZzbucmQPU44} - {From Photoshop to Prototype with Qt Design Studio} - \endlist - \section1 Importing Metadata & Assets \QBPS can import metadata generated from other tools and generate a Photoshop document. A diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc index a85a2473101..5471fdbf287 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc @@ -52,4 +52,6 @@ Sketch, you should follow the guidelines for working with Sketch and organizing your assets. \endlist + + \include qtbridge-tutorial-links.qdocinc qtsketchbridge tutorials */ diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-tutorial-links.qdocinc b/doc/qtdesignstudio/src/qtbridge/qtbridge-tutorial-links.qdocinc new file mode 100644 index 00000000000..4508b9acc4a --- /dev/null +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-tutorial-links.qdocinc @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Bridge documentation. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** +****************************************************************************/ + +//! [qtpsbridge videos] + + \section1 \QBPS Videos + + For more information, watch a video tutorial and webinar about using \QBPS + that are also accessible from the \uicontrol Tutorials tab of the Welcome + mode: + + \list + \li Building an Instrument Cluster for Your Car HMI, Part 1 + + \youtube aV6kFxH3Xws + + You can access the Cluster tutorial source files in the + \uicontrol Examples tab. + + \li From Photoshop to Prototype with Qt Design Studio + + \youtube ZzbucmQPU44 + \endlist + +//! [qtpsbridge videos] + + +//! [qtsketchbridge tutorials] + + \section1 \QBSK Tutorials + + For more information, read the tutorials about using \QBSK that are also + accessible from the \uicontrol Tutorials tab of the Welcome mode: + + \list + \li \l{https://www.qt.io/blog/qt-design-studio-sketch-bridge-tutorial-part-1} + {Sketch Bridge Tutorial Part 1} + \li \l{https://www.qt.io/blog/qt-design-studio-sketch-bridge-tutorial-part-2} + {Sketch Bridge Tutorial Part 2} + \endlist + +//! [qtsketchbridge tutorials] diff --git a/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc index d1fa52b418b..6494ac4d1fd 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc @@ -38,8 +38,8 @@ The \uicontrol Tutorials tab contains links to video tutorials that provide more information about \QDS. - You can access the Cluster tutorial source files in the \uicontrol Examples - tab. + \include qtbridge-tutorial-links.qdocinc qtpsbridge videos + \include qtbridge-tutorial-links.qdocinc qtsketchbridge tutorials \section1 Examples diff --git a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc index 8314d6cd660..83cef36ea5b 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc @@ -100,19 +100,6 @@ \uicontrol {Asset Import} dialog while importing, fix the issues in design tool and export the assets again. - \section1 \QB Videos - - For more information, see the \QB tutorials that are also accessible from - the \uicontrol Tutorials tab of the Welcome mode: - - \list - \li \l{https://resources.qt.io/development-topic-ui-design/qtdesignstudio-clustertutorial-partone} - {Building an Instrument Cluster for Your Car HMI, Part 1} (\QBPS) - \li \l{https://www.youtube.com/watch?v=ZzbucmQPU44} - {From Photoshop to Prototype with Qt Design Studio} - \li \l{https://www.qt.io/blog/qt-design-studio-sketch-bridge-tutorial-part-1} - {Sketch Bridge Tutorial Part 1} - \li \l{https://www.qt.io/blog/qt-design-studio-sketch-bridge-tutorial-part-2} - {Sketch Bridge Tutorial Part 2} - \endlist + \include qtbridge-tutorial-links.qdocinc qtpsbridge videos + \include qtbridge-tutorial-links.qdocinc qtsketchbridge tutorials */ diff --git a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc index 7c8ae924725..0eca243f587 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc @@ -81,6 +81,11 @@ application. \endlist + For an example of creating a \uicontrol {Qt Quick 3D Application} project, + watch the following video: + + \youtube 9ihYeC0YJ0M + \section1 Using Project Wizards \list 1