summaryrefslogtreecommitdiff
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
parent8c472f2074c58a48ce07a6b7e12a295aa3035bd1 (diff)
downloadqt-creator-db48c49af94b13bf33edf6e0bcad6fe77f988c28.tar.gz
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>
-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
-rw-r--r--doc/src/analyze/cpu-usage-analyzer.qdoc2
-rw-r--r--doc/src/analyze/creator-clang-static-analyzer.qdoc2
-rw-r--r--doc/src/howto/creator-autotest.qdoc2
-rw-r--r--doc/src/overview/creator-commercial-overview.qdoc2
-rw-r--r--doc/src/qtquick/qtquick-connection-editor.qdoc2
-rw-r--r--doc/src/qtquick/qtquick-designer-extensions.qdoc2
-rw-r--r--doc/src/qtquick/qtquick-pathview-editor.qdoc2
10 files changed, 19 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 \
diff --git a/doc/src/analyze/cpu-usage-analyzer.qdoc b/doc/src/analyze/cpu-usage-analyzer.qdoc
index 1a2971b79d..e3eb74cdfd 100644
--- a/doc/src/analyze/cpu-usage-analyzer.qdoc
+++ b/doc/src/analyze/cpu-usage-analyzer.qdoc
@@ -30,6 +30,8 @@
\title Analyzing CPU Usage
+ \commercial
+
\QC is integrated with the Linux Perf tool (commercial only) that can be
used to analyze the CPU usage of an application on embedded devices and, to
a limited extent, on Linux desktop platforms. The CPU Usage Analyzer uses
diff --git a/doc/src/analyze/creator-clang-static-analyzer.qdoc b/doc/src/analyze/creator-clang-static-analyzer.qdoc
index 3485be704f..b469221379 100644
--- a/doc/src/analyze/creator-clang-static-analyzer.qdoc
+++ b/doc/src/analyze/creator-clang-static-analyzer.qdoc
@@ -31,6 +31,8 @@
\title Using Clang Static Analyzer
+ \commercial
+
\QC integrates the \l{http://clang-analyzer.llvm.org}
{Clang Static Analyzer} for finding problems in C, C++, and Objective-C
programs (commercial only).
diff --git a/doc/src/howto/creator-autotest.qdoc b/doc/src/howto/creator-autotest.qdoc
index 8500c1c128..a394dcc62f 100644
--- a/doc/src/howto/creator-autotest.qdoc
+++ b/doc/src/howto/creator-autotest.qdoc
@@ -35,6 +35,8 @@
\title Running Autotests
+ \commercial
+
\QC integrates the \l{Qt Test} framework for unit testing Qt based
applications and libraries (commercial only). You can use \QC to build and
run autotests for your projects.
diff --git a/doc/src/overview/creator-commercial-overview.qdoc b/doc/src/overview/creator-commercial-overview.qdoc
index 3665d5c095..f21189d373 100644
--- a/doc/src/overview/creator-commercial-overview.qdoc
+++ b/doc/src/overview/creator-commercial-overview.qdoc
@@ -28,6 +28,8 @@
\title Qt Creator Commercial Features
+ \commercial
+
You can use the following \QC features if you have the appropriate
\l{http://qt.io/licensing/}{Qt license}:
diff --git a/doc/src/qtquick/qtquick-connection-editor.qdoc b/doc/src/qtquick/qtquick-connection-editor.qdoc
index 6fb08767e2..2d3aa49ccf 100644
--- a/doc/src/qtquick/qtquick-connection-editor.qdoc
+++ b/doc/src/qtquick/qtquick-connection-editor.qdoc
@@ -35,6 +35,8 @@
\title Adding Connections
+ \commercial
+
You can use the \uicontrol {Connections} view (commercial only) to:
\list
diff --git a/doc/src/qtquick/qtquick-designer-extensions.qdoc b/doc/src/qtquick/qtquick-designer-extensions.qdoc
index 0ff8231c7a..127a186042 100644
--- a/doc/src/qtquick/qtquick-designer-extensions.qdoc
+++ b/doc/src/qtquick/qtquick-designer-extensions.qdoc
@@ -35,6 +35,8 @@
\title Using Qt Quick Designer Extensions
+ \commercial
+
\image qmldesigner-extensions.png
\QMLD contains commercial features that make developing Qt Quick
diff --git a/doc/src/qtquick/qtquick-pathview-editor.qdoc b/doc/src/qtquick/qtquick-pathview-editor.qdoc
index d65310f9ad..4e15cb0424 100644
--- a/doc/src/qtquick/qtquick-pathview-editor.qdoc
+++ b/doc/src/qtquick/qtquick-pathview-editor.qdoc
@@ -35,6 +35,8 @@
\title Editing PathView Properties
+ \commercial
+
A \l{PathView} lays out data provided by data models on a \l{Path}.
A graphical spline editor enables you to specify PathView paths, which