diff options
author | Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> | 2016-01-25 11:08:08 +0100 |
---|---|---|
committer | Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> | 2016-01-26 09:27:29 +0000 |
commit | 2eaaed3428b65f25ceccdec9d6c2ba402290858b (patch) | |
tree | 2d837698b6c7a49d201e1bd0dd268cbd84e16c43 /doc | |
parent | 126d1b0811b019fd6dbb824e544b222c11b33ff5 (diff) | |
download | qt-creator-2eaaed3428b65f25ceccdec9d6c2ba402290858b.tar.gz |
Doc: update information about commercial features
Using the Auto test plugin or QML Profiler extensions
no longer requires a commercial lincense.
The ISO Icon Browser was missing from the list of commercial
features.
Change-Id: Ic40c8ae5bddea5424f2de57d8e2ece17588428ff
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/analyze/qtquick-profiler.qdoc | 16 | ||||
-rw-r--r-- | doc/src/howto/creator-autotest.qdoc | 4 | ||||
-rw-r--r-- | doc/src/howto/creator-ui.qdoc | 7 | ||||
-rw-r--r-- | doc/src/overview/creator-commercial-overview.qdoc | 10 | ||||
-rw-r--r-- | doc/src/overview/creator-overview.qdoc | 2 | ||||
-rw-r--r-- | doc/src/overview/creator-testing.qdoc | 2 | ||||
-rw-r--r-- | doc/src/projects/creator-projects-creating.qdoc | 2 |
7 files changed, 10 insertions, 33 deletions
diff --git a/doc/src/analyze/qtquick-profiler.qdoc b/doc/src/analyze/qtquick-profiler.qdoc index 5b4a8a6129..c1ad332569 100644 --- a/doc/src/analyze/qtquick-profiler.qdoc +++ b/doc/src/analyze/qtquick-profiler.qdoc @@ -208,8 +208,7 @@ The following types of events are displayed in the timeline view on one or several rows. The availability of event types depends on the version of Qt - the application was compiled with, the version of Qt Quick it is using, and - whether \QC or \QCE is used to profile it. + the application was compiled with and the version of Qt Quick it is using. \table @@ -218,7 +217,6 @@ \li Description \li Minimum Qt Version \li Qt Quick Version - \li Commercial Only \row \li \uicontrol {Pixmap Cache} @@ -227,7 +225,6 @@ with specifics about its file name and size. \li Qt 5.1 \li Qt Quick 2 - \li \image ok \row \li \uicontrol {Scene Graph} @@ -236,7 +233,7 @@ so. \li Qt 5.1 \li Qt Quick 2 - \li \image ok + \row \li \uicontrol {Memory Usage} \li Displays block allocations of the JavaScript memory manager. @@ -251,21 +248,18 @@ requested. \li Qt 5.4 \li Qt Quick 2 - \li \image ok \row \li \uicontrol {Input Events} \li Displays mouse and keyboard events. \li Qt 4.7.4 \li Qt Quick 1 or Qt Quick 2 - \li \image ok \row \li \uicontrol Painting \li Displays the time spent painting the scene for each frame. \li Qt 4.7.4 \li Qt Quick 1 - \li \row \li \uicontrol Animations @@ -276,14 +270,12 @@ animations are shown in a separate row then. \li Qt 5.0 (Qt 5.3) \li Qt Quick 2 - \li \row \li \uicontrol Compiling \li Displays the time spent compiling the QML files. \li Qt 4.7.4 \li Qt Quick 1 or Qt Quick 2 - \li \row \li \uicontrol Creating @@ -298,7 +290,6 @@ events. \li Qt 4.7.4 (Qt 5.2.1) \li Qt Quick 1 or Qt Quick 2 - \li \row \li \uicontrol Binding @@ -306,7 +297,6 @@ evaluation takes. \li Qt 4.7.4 \li Qt Quick 1 or Qt Quick 2 - \li \row \li \uicontrol {Handling Signal} @@ -314,7 +304,6 @@ handling takes. \li Qt 4.7.4 \li Qt Quick 1 or Qt Quick 2 - \li \row \li \uicontrol JavaScript @@ -323,7 +312,6 @@ you may be using to evaluate bindings or handle signals. \li Qt 5.3 \li Qt Quick 2 - \li \endtable diff --git a/doc/src/howto/creator-autotest.qdoc b/doc/src/howto/creator-autotest.qdoc index cc70295f99..02d6709357 100644 --- a/doc/src/howto/creator-autotest.qdoc +++ b/doc/src/howto/creator-autotest.qdoc @@ -31,10 +31,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 + applications and libraries. You can use \QC to build and run autotests for your projects. \image qtcreator-autotests.png diff --git a/doc/src/howto/creator-ui.qdoc b/doc/src/howto/creator-ui.qdoc index 9cdd0b6102..b08b688f1a 100644 --- a/doc/src/howto/creator-ui.qdoc +++ b/doc/src/howto/creator-ui.qdoc @@ -139,8 +139,7 @@ \li \uicontrol Outline shows the symbol hierarchy of a C++ file and the type hierarchy of a QML file. - \li \uicontrol Tests lists autotests and Qt Quick tests in the project - (commercial only). + \li \uicontrol Tests lists autotests and Qt Quick tests in the project. \li \uicontrol {Type Hierarchy} shows the base classes of a class. @@ -297,7 +296,7 @@ \section2 Viewing Tests The \uicontrol Tests view shows the autotests and Qt Quick tests in the - current project (commercial only). Select the test cases to run. If a Qt + current project. Select the test cases to run. If a Qt Quick test case does not have a name, it is marked \uicontrol Unnamed in the list. Unnamed test cases are always executed when the application that contains them is run, and therefore you cannot select or deselect them. @@ -350,7 +349,7 @@ \li \uicontrol{General Messages} - \li \uicontrol{Test Results} (commercial only) + \li \uicontrol{Test Results} \endlist diff --git a/doc/src/overview/creator-commercial-overview.qdoc b/doc/src/overview/creator-commercial-overview.qdoc index 6cebe87a7c..8e2d9243d3 100644 --- a/doc/src/overview/creator-commercial-overview.qdoc +++ b/doc/src/overview/creator-commercial-overview.qdoc @@ -41,16 +41,8 @@ \l{http://qt.io/licensing/}{Qt license}: \list - \li \l{Running Autotests} - \li Additional \l{Understanding the Data}{QML Profiler} event - categories: - \list - \li Pixmap cache - \li \l{Analyzing Scene Graph Events}{Scene graph} - \li Memory usage - \li Input events - \endlist \li \l{Analyzing CPU Usage}{CPU Usage Analyzer} + \li \l{Browsing ISO 7000 Icons} in \QMLD \li \l{http://doc.qt.io/QtQuickCompiler/}{Qt Quick Compiler} integration \li \l{http://doc.qt.io/QtForDeviceCreation/index.html}{Developing for diff --git a/doc/src/overview/creator-overview.qdoc b/doc/src/overview/creator-overview.qdoc index 1d31358328..a9bf26f3f1 100644 --- a/doc/src/overview/creator-overview.qdoc +++ b/doc/src/overview/creator-overview.qdoc @@ -114,7 +114,7 @@ \QC is integrated to the \l{Qt Test} framework for unit testing Qt based applications and libraries. You can use \QC to build - and run autotests (commercial only). + and run autotests. For more information, see \l{Testing}. \li \b {Publishing} diff --git a/doc/src/overview/creator-testing.qdoc b/doc/src/overview/creator-testing.qdoc index 42c4511ee9..c70f8ff562 100644 --- a/doc/src/overview/creator-testing.qdoc +++ b/doc/src/overview/creator-testing.qdoc @@ -61,7 +61,7 @@ \li \l{Running Autotests} You can use an experimental Auto Test plugin to build and run - autotests using \QC (commercial only). + autotests using \QC. \endlist diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index b1d2af132e..c7512b421e 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -166,7 +166,7 @@ Qt unit tests for features or classes - \li Qt Auto Test (commercial only) + \li Qt Auto Test Projects with boilerplate code for an autotest. For more information, see \l {Creating Autotests}. |