Commit 5bfe37c5 authored by Kai Koehne's avatar Kai Koehne

Add documentation for extensions of Qml Performance Monitor

Can be enabled by passing LICENSE_TYPE=enterprise to qmake.

Change-Id: I49044c2425a056980b6e9f8377e6a33c1beaca5a
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@digia.com>
parent 14d515df
......@@ -10,7 +10,8 @@ defines = Q_QDOC \
Q_BYTE_ORDER \
QT_DEPRECATED \
Q_NO_USING_KEYWORD \
__cplusplus
__cplusplus \
$QTC_LICENSE_TYPE
versionsym = QT_VERSION_STR
......
......@@ -11,6 +11,8 @@ greaterThan(QT_MAJOR_VERSION, 4) {
VERSION_TAG = $$replace(QTCREATOR_VERSION, "[-.]", )
isEmpty(LICENSE_TYPE):LICENSE_TYPE=opensource
# unset the installdir for qdoc, so we force generation
# of URLs for the links to the Qt documentation
QMAKE_DOCS_INSTALLDIR =
......@@ -21,7 +23,7 @@ defineReplace(cmdEnv) {
}
defineReplace(qdoc) {
return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS]) $$QDOC_BIN")
return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG QTC_LICENSE_TYPE=$$LICENSE_TYPE QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS]) $$QDOC_BIN")
}
QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
......
......@@ -98,6 +98,11 @@
The \gui Timeline view displays graphical representations of:
\list
\if defined(enterprise)
\li Pixmap loading times and cache sizes
\li Scene graph events
\endif
\li Painting operations
......@@ -113,7 +118,14 @@
\endlist
\if defined(enterprise)
Information about the pixmap cache and scene graph events are only available
from Qt 5.1 onwards.
\image qtcreator-qml-performance-monitor-enterprise.png "QML Profiler"
\else
\image qtcreator-qml-performance-monitor.png "QML Profiler"
\endif
Each row in the timeline (6) describes a type of QML events that were
recorded. Move the cursor on an event on a row to see how long it takes and
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment