aboutsummaryrefslogtreecommitdiffstats
path: root/doc/config
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>2015-04-08 12:43:38 +0200
committerLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>2015-04-08 10:45:50 +0000
commitdb48c49af94b13bf33edf6e0bcad6fe77f988c28 (patch)
tree7cc06c78bb25bcaaabcaf057a2da92cad4e48b4e /doc/config
parent8c472f2074c58a48ce07a6b7e12a295aa3035bd1 (diff)
Doc: add a "commercial" icon to commercial-only topics
For purely commercial apps, this is done by using the template, but Qt Creator is mostly open source, so an image is used. Use a \commercial macro with a tooltip and link to the image. Change-Id: I5e3df953821551331afef2ec642b482b52ff909e Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'doc/config')
-rw-r--r--doc/config/images/commercial.pngbin0 -> 334 bytes
-rw-r--r--doc/config/macros.qdocconf1
-rw-r--r--doc/config/qtcreator-project.qdocconf4
3 files changed, 5 insertions, 0 deletions
diff --git a/doc/config/images/commercial.png b/doc/config/images/commercial.png
new file mode 100644
index 0000000000..852737d4bc
--- /dev/null
+++ b/doc/config/images/commercial.png
Binary files differ
diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf
index 38971f6e67..0fc6155887 100644
--- a/doc/config/macros.qdocconf
+++ b/doc/config/macros.qdocconf
@@ -34,6 +34,7 @@ macro.begincomment = "\\c{/*}"
macro.endcomment = "\\c{*/}"
macro.uuml.HTML = "&uuml;"
macro.mdash.HTML = "&mdash;"
+macro.commercial = "\\raw HTML\n<p><a title=\"Available under certain Qt licenses.\"><img src=\"images/commercial.png\"/></a></p>\n\\endraw"
macro.beginfloatleft.HTML = "<div style=\"float: left; margin-right: 2em\">"
macro.beginfloatright.HTML = "<div style=\"float: right; margin-left: 2em\">"
diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf
index d4dc2f247c..598bd32735 100644
--- a/doc/config/qtcreator-project.qdocconf
+++ b/doc/config/qtcreator-project.qdocconf
@@ -8,6 +8,10 @@ imagedirs = $SRCDIR/images $SRCDIR/templates/images
outputdir = $OUTDIR
exampledirs = $SRCDIR/examples
+HTML.extraimages = images/commercial.png
+qhp.QtCreator.extraFiles = images/commercial.png
+
+
indexes += $QDOC_INDEX_DIR/qtwidgets/qtwidgets.index \
$QDOC_INDEX_DIR/qtcore/qtcore.index \
$QDOC_INDEX_DIR/qtqml/qtqml.index \