diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2022-10-12 10:18:06 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-10-13 10:50:55 +0000 |
| commit | c2ed12d713535df268f8e187e6009c50b80634a9 (patch) | |
| tree | 562915df5c0a22a50fa61f67407541c2773a47e5 | |
| parent | a6d1e10efa35d32ac4e7705eea6fbde39189cfeb (diff) | |
| download | qtdoc-c2ed12d713535df268f8e187e6009c50b80634a9.tar.gz | |
Fix path for YouTube video thumbnail
A relative path was used to refer to a thumbnail image for a video link
on Qt for Android overview page. While QDoc was able to locate and copy
the image to the output directory, the relative path appears as-is in
the generated .qhp file and is no longer correct, causing qhelpgenerator
to ignore it.
Consolidate all 'extra images' into the same source directory and handle
them in one location in the .qdocconf file.
Change-Id: I66531da883bac57fcf32e75c11eb087a648d9798
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
(cherry picked from commit 4ed44071676b09d0f55a9f2a865d18ba7e6ce4b1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | doc/config/images/5OiIqFTjUZI.jpg (renamed from doc/images/5OiIqFTjUZI.jpg) | bin | 57742 -> 57742 bytes | |||
| -rw-r--r-- | doc/config/qtdoc.qdocconf | 12 |
2 files changed, 5 insertions, 7 deletions
diff --git a/doc/images/5OiIqFTjUZI.jpg b/doc/config/images/5OiIqFTjUZI.jpg Binary files differindex 91dbba83..91dbba83 100644 --- a/doc/images/5OiIqFTjUZI.jpg +++ b/doc/config/images/5OiIqFTjUZI.jpg diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf index 98e8ebf4..7e7c9f41 100644 --- a/doc/config/qtdoc.qdocconf +++ b/doc/config/qtdoc.qdocconf @@ -62,9 +62,11 @@ qhp.QtDoc.subprojects.examples.indexTitle = Qt Examples And Tutorials qhp.QtDoc.subprojects.examples.selectors = fake:example qhp.QtDoc.subprojects.examples.sortPages = true -# Add an image used in example manifests to qhp -HTML.extraimages += images/qt-codesample.png -qhp.QtDoc.extraFiles += images/qt-codesample.png +# Add an image used in example manifests to qhp, as well as thumbnails for YouTube links +{HTML.extraimages,qhp.QtDoc.extraFiles} += \ + images/qt-codesample.png \ + images/yIv0vO8B7tQ.jpg \ + images/5OiIqFTjUZI.jpg # Add an .html file with sidebar content, used in the online style HTML.stylesheets += style/qt5-sidebar.html @@ -77,10 +79,6 @@ macro.qtmajorversion.match = "^(\\d+)" macro.qt5 = "\\l{https://doc.qt.io/qt-5/\1}{\2}" macro.qtbug = "\\l{https://bugreports.qt.io/browse/\1}{\1}" -# Config to enable YouTube links in the offline documentation -{HTML.extraimages,qhp.QtDoc.extraFiles} += images/yIv0vO8B7tQ.jpg \ - ../images/5OiIqFTjUZI.jpg - manifestmeta.highlighted.names = "QtDoc/Coffee Machine Example" \ "QtDoc/Qt Quick Demo - Same Game" \ "QtDoc/Qt Quick Demo - Calqlatr" |
