summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2013-09-17 10:40:00 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-17 12:11:34 +0200
commitfff32616c31da95366e4ea513ced6a4e04b39d5d (patch)
treecd54fca0fac6e86039dee258cff397e538df0a8a
parentc0ba30dbc25884ceb9312280620eeb7084ca7730 (diff)
Doc: Move generic code sample image and add it to qhpold/5.1
In order to add extra images to a qhp file, we need to both add it to output directory using HTML.extraimages, and from there to qhp using qhp.QtDoc.extraFiles. Also move the image to a better location and resize it to look better in Qt Creator. Task-number: QTBUG-31314 Change-Id: I817c9bb0e464b1f05430b4191b3bea21961ea122 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--doc/config/images/qt-codesample.pngbin0 -> 5048 bytes
-rw-r--r--doc/config/qtdoc-qhp.qdocconf4
-rw-r--r--doc/src/images/qt-codesample.pngbin6897 -> 0 bytes
3 files changed, 4 insertions, 0 deletions
diff --git a/doc/config/images/qt-codesample.png b/doc/config/images/qt-codesample.png
new file mode 100644
index 000000000..e798ae244
--- /dev/null
+++ b/doc/config/images/qt-codesample.png
Binary files differ
diff --git a/doc/config/qtdoc-qhp.qdocconf b/doc/config/qtdoc-qhp.qdocconf
index 95d9546f7..3e088f6b4 100644
--- a/doc/config/qtdoc-qhp.qdocconf
+++ b/doc/config/qtdoc-qhp.qdocconf
@@ -21,3 +21,7 @@ qhp.QtDoc.subprojects.qmltypes.sortPages = true
qhp.QtDoc.subprojects.examples.title = Tutorials and Examples
qhp.QtDoc.subprojects.examples.indexTitle = Qt Examples And Tutorials
qhp.QtDoc.subprojects.examples.selectors = fake:example
+
+# Add an image used in example manifests to qhp
+HTML.extraimages += images/qt-codesample.png
+qhp.QtDoc.extraFiles += images/qt-codesample.png
diff --git a/doc/src/images/qt-codesample.png b/doc/src/images/qt-codesample.png
deleted file mode 100644
index 5e5f79e4f..000000000
--- a/doc/src/images/qt-codesample.png
+++ /dev/null
Binary files differ