diff --git a/doc/config/images/commercial.png b/doc/config/images/commercial.png new file mode 100644 index 0000000000000000000000000000000000000000..852737d4bcb5c55e7e7b72066d26f5715a780073 Binary files /dev/null and b/doc/config/images/commercial.png differ diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf index 38971f6e67becf6a9f26bd8a8bf6b2708b23864d..0fc61558877c99bea79bbbf3b21606795d8b04bf 100644 --- a/doc/config/macros.qdocconf +++ b/doc/config/macros.qdocconf @@ -34,6 +34,7 @@ macro.begincomment = "\\c{/*}" macro.endcomment = "\\c{*/}" macro.uuml.HTML = "ü" macro.mdash.HTML = "—" +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 d4dc2f247c1edd9c62875514326ff58c028c7358..598bd327358aff54a7862f0cfa05962e570d30b8 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 1a2971b79deccc5352d1394d471544db7b5947a7..e3eb74cdfdc4af4a3809f2ab8e013baa32abde90 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 3485be704fa4c8d078ae66cedb9cef8c38891ecb..b4692213793d029ed6f92176488780add7e077a5 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 8500c1c128212f2c82ff2f03aad5f8f9e6ac07f4..a394dcc62f27165bb832d99700a7a8b96285c271 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 3665d5c095ae9f37988f0cfa3ed9a21b36815737..f21189d373c961183aa3ced744af44d38e9c47e9 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 6fb08767e2c39a4e7df8ae7198cf140fc3620343..2d3aa49ccf6a880d5d94e7e8e66f8daa06993816 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 0ff8231c7a53e151dc9cf341bc4c237821673a64..127a1860425ce2ffc16b93b06cbcf40172204083 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 d65310f9adbad0cc7a45984039e46f79b592a176..4e15cb0424a013fab0d41d0a42b02ef6beeb6810 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