From b9886a4b0416951a54484b23370c1fbb0cd771c0 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 27 Nov 2020 18:21:33 +0100 Subject: [PATCH] Doc: Fix the \youtube macro for use with liteHTML help backend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Create a common directory for extra image files, and move the video thumbnails there. This folder structure is required to work around the fact that relative image paths passed to qhp..extraFiles are not resolved correctly when loading the generated help project. Change-Id: Iff5583a9a318670571b7f706182723e54e0ec466 Reviewed-by: Leena Miettinen Reviewed-by: Topi Reiniƶ --- doc/config/macros-online.qdocconf | 4 ++++ doc/config/macros.qdocconf | 6 ++---- doc/qtcreator/config/qtcreator-project.qdocconf | 3 +-- .../images/extraimages/images}/9ihYeC0YJ0M.jpg | Bin .../images/extraimages/images/RfEYO-5Mw6s.jpg | Bin 0 -> 6513 bytes .../images/extraimages/images}/SsFWyUeAA_4.jpg | Bin .../images/extraimages/images}/ZzbucmQPU44.jpg | Bin .../images/extraimages/images}/aV6kFxH3Xws.jpg | Bin .../images/extraimages}/images/commercial.png | Bin .../images/extraimages/images/yOUdg1o2KJM.jpg | Bin 0 -> 9726 bytes .../extraimages/qtcreator-extraimages.qdocconf | 4 ++++ .../qtdesignstudio-extraimages.qdocconf | 8 ++++++++ doc/qtcreator/qtcreator-online.qdocconf | 3 +++ doc/qtcreator/src/qtquick/qtquick-designer.qdoc | 3 +++ .../config/qtdesignstudio.qdocconf | 9 ++------- .../qtdesignstudio-online.qdocconf | 3 +++ 16 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 doc/config/macros-online.qdocconf rename doc/{qtdesignstudio/images/videoicons => qtcreator/images/extraimages/images}/9ihYeC0YJ0M.jpg (100%) create mode 100644 doc/qtcreator/images/extraimages/images/RfEYO-5Mw6s.jpg rename doc/{qtdesignstudio/images/videoicons => qtcreator/images/extraimages/images}/SsFWyUeAA_4.jpg (100%) rename doc/{qtdesignstudio/images/videoicons => qtcreator/images/extraimages/images}/ZzbucmQPU44.jpg (100%) rename doc/{qtdesignstudio/images/videoicons => qtcreator/images/extraimages/images}/aV6kFxH3Xws.jpg (100%) rename doc/{config => qtcreator/images/extraimages}/images/commercial.png (100%) create mode 100644 doc/qtcreator/images/extraimages/images/yOUdg1o2KJM.jpg create mode 100644 doc/qtcreator/images/extraimages/qtcreator-extraimages.qdocconf create mode 100644 doc/qtcreator/images/extraimages/qtdesignstudio-extraimages.qdocconf diff --git a/doc/config/macros-online.qdocconf b/doc/config/macros-online.qdocconf new file mode 100644 index 00000000000..c6f370a7d76 --- /dev/null +++ b/doc/config/macros-online.qdocconf @@ -0,0 +1,4 @@ +macro.youtube.HTML = "
\n\n" \ + "
\n" diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf index d2e02d06784..0d9e14ffa0a 100644 --- a/doc/config/macros.qdocconf +++ b/doc/config/macros.qdocconf @@ -55,10 +55,8 @@ macro.emptyspan.HTML = "" # HTML.extraimages += images/dQw4w9WgXcQ.jpg # qhp.ProjectName.extraFiles += images/dQw4w9WgXcQ.jpg # -macro.youtube.HTML = "
\n\n" \ - "
\n" + "\n" diff --git a/doc/qtcreator/config/qtcreator-project.qdocconf b/doc/qtcreator/config/qtcreator-project.qdocconf index cff09e5c3bc..479d17ed8b2 100644 --- a/doc/qtcreator/config/qtcreator-project.qdocconf +++ b/doc/qtcreator/config/qtcreator-project.qdocconf @@ -43,8 +43,7 @@ imagedirs = ../images \ exampledirs = ../examples examples.fileextensions += *.qml *.svg -HTML.extraimages = ../../config/images/commercial.png -qhp.QtCreator.extraFiles = ../../config/images/commercial.png +include(../../qtcreator/images/extraimages/qtcreator-extraimages.qdocconf) depends += qtandroidextras\ qtwidgets \ diff --git a/doc/qtdesignstudio/images/videoicons/9ihYeC0YJ0M.jpg b/doc/qtcreator/images/extraimages/images/9ihYeC0YJ0M.jpg similarity index 100% rename from doc/qtdesignstudio/images/videoicons/9ihYeC0YJ0M.jpg rename to doc/qtcreator/images/extraimages/images/9ihYeC0YJ0M.jpg diff --git a/doc/qtcreator/images/extraimages/images/RfEYO-5Mw6s.jpg b/doc/qtcreator/images/extraimages/images/RfEYO-5Mw6s.jpg new file mode 100644 index 0000000000000000000000000000000000000000..fecd5b70efee20789e4de00e6ca42dfea5d50431 GIT binary patch literal 6513 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 literal 0 HcmV?d00001 diff --git a/doc/qtcreator/images/extraimages/qtcreator-extraimages.qdocconf b/doc/qtcreator/images/extraimages/qtcreator-extraimages.qdocconf new file mode 100644 index 00000000000..91688081176 --- /dev/null +++ b/doc/qtcreator/images/extraimages/qtcreator-extraimages.qdocconf @@ -0,0 +1,4 @@ +{HTML.extraimages,qhp.QtCreator.extraFiles} += \ + images/commercial.png \ + images/RfEYO-5Mw6s.jpg \ + images/yOUdg1o2KJM.jpg diff --git a/doc/qtcreator/images/extraimages/qtdesignstudio-extraimages.qdocconf b/doc/qtcreator/images/extraimages/qtdesignstudio-extraimages.qdocconf new file mode 100644 index 00000000000..6578308433a --- /dev/null +++ b/doc/qtcreator/images/extraimages/qtdesignstudio-extraimages.qdocconf @@ -0,0 +1,8 @@ +{HTML.extraimages,qhp.qtdesignstudio.extraFiles} += \ + images/commercial.png \ + images/SsFWyUeAA_4.jpg \ + images/9ihYeC0YJ0M.jpg \ + images/aV6kFxH3Xws.jpg \ + images/ZzbucmQPU44.jpg \ + images/RfEYO-5Mw6s.jpg \ + images/yOUdg1o2KJM.jpg diff --git a/doc/qtcreator/qtcreator-online.qdocconf b/doc/qtcreator/qtcreator-online.qdocconf index 2a0ace23128..b96e6e53979 100644 --- a/doc/qtcreator/qtcreator-online.qdocconf +++ b/doc/qtcreator/qtcreator-online.qdocconf @@ -16,5 +16,8 @@ HTML.footer = \ include($QT_INSTALL_DOCS/global/qt-html-templates-online.qdocconf) +# Override macros for online use +include(../config/macros-online.qdocconf) + # Add an .html file with sidebar content, used in the online style HTML.stylesheets += config/style/qt5-sidebar.html diff --git a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc index 98059facac7..b64db4fdf5e 100644 --- a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc @@ -108,4 +108,7 @@ You can move the views anywhere on the screen and save them as \e workspaces, as instructed in \l {Managing Workspaces}. + Watch a video about using the Design mode views: + + \youtube RfEYO-5Mw6s */ diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf index 56c602c2540..cdb97676c2a 100644 --- a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf +++ b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf @@ -39,6 +39,8 @@ imagedirs = ../images \ ../../../src/plugins/qmldesigner/qtquickplugin/images \ ../../../src/plugins/texteditor/images +include(../../qtcreator/images/extraimages/qtdesignstudio-extraimages.qdocconf) + excludefiles += ../../qtcreator/src/qtcreator.qdoc \ ../../qtcreator/src/qtcreator-toc.qdoc @@ -69,13 +71,6 @@ exampledirs = ../examples/ \ ../../qtcreator/examples examples.fileextensions += *.qml *.svg *.ts *.qm -{HTML.extraimages,qhp.qtdesignstudio.extraFiles} += ../../config/images/commercial.png \ - ../images/videoicons/SsFWyUeAA_4.jpg \ - ../images/videoicons/9ihYeC0YJ0M.jpg \ - ../images/videoicons/aV6kFxH3Xws.jpg \ - ../images/videoicons/ZzbucmQPU44.jpg - - depends += qtwidgets \ qtcore \ qtqml \ diff --git a/doc/qtdesignstudio/qtdesignstudio-online.qdocconf b/doc/qtdesignstudio/qtdesignstudio-online.qdocconf index 27121048cb6..5fc198cc452 100644 --- a/doc/qtdesignstudio/qtdesignstudio-online.qdocconf +++ b/doc/qtdesignstudio/qtdesignstudio-online.qdocconf @@ -3,6 +3,9 @@ include($QT_INSTALL_DOCS/global/qt-html-templates-online.qdocconf) include(config/html-online.qdocconf) include(config/qtdesignstudio.qdocconf) +# Override macros for online use +include(../config/macros-online.qdocconf) + # Add an .html file with sidebar content, used in the online style HTML.stylesheets += config/style/qt5-sidebar.html