diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | doc/src/platforms/platform-notes-rtos.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/qmlapp/debugging.qdoc | 16 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_deployment.qdoc | 2 |
4 files changed, 15 insertions, 11 deletions
diff --git a/.qmake.conf b/.qmake.conf index f8e11680..f34c3589 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.4.2 +MODULE_VERSION = 5.4.3 diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/platform-notes-rtos.qdoc index 264b52ff..bd6169ef 100644 --- a/doc/src/platforms/platform-notes-rtos.qdoc +++ b/doc/src/platforms/platform-notes-rtos.qdoc @@ -44,8 +44,6 @@ \contentspage Platform and Compiler Notes \target QNX - \note QNX Neutrino RTOS is a community supported platform. See the \l{http://wiki.qt.io/Qnx}{related page} on the Qt Project wiki. - \section1 Supported Architectures and QNX Releases From the perspective of an application development platform, Qt runs on top of @@ -67,12 +65,12 @@ For a specific list of available boards, displays and input devices, contact QNX Software Systems (info@qnx.com) or KDAB (qnx-info@kdab.com). Qt on the QNX Neutrino OS is also supported - by Qt Enterprise Embedded, \l {http://qt.digia.com/About-Us/Contact-Us/}{contact Digia Qt} + by Qt Enterprise Embedded, \l {http://www.qt.io/contact-us/}{contact The Qt Company} for more details. \section1 Supported Modules - Almost all Qt Essential \l{All Modules}{modules} and quite some add-ons are supported on + Almost all Qt Essential \l{All Modules}{modules} and some add-ons are supported on the QNX Neutrino RTOS. See the \l{http://wiki.qt.io/Qt_Status_on_QNX} {status page on the Qt Project wiki} for details. diff --git a/doc/src/qmlapp/debugging.qdoc b/doc/src/qmlapp/debugging.qdoc index 3972c36d..b9ab0e22 100644 --- a/doc/src/qmlapp/debugging.qdoc +++ b/doc/src/qmlapp/debugging.qdoc @@ -34,6 +34,7 @@ \section1 Console API \section2 Log +\keyword console log \c console.log, console.debug, console.info, console.warn and console.error can be used to print debugging information to the console. For example: @@ -48,6 +49,7 @@ The output is generated using the qDebug, qWarning, qCritical methods in C++ (see also \l {Debugging Techniques}). \section2 Assert +\keyword console assert \c console.assert tests that an expression is true. If not, it will write an optional message to the console and print the stack trace. @@ -61,7 +63,8 @@ function f() { \endcode \section2 Timer - +\keyword console time +\keyword console timeEnd \c console.time and console.timeEnd log the time (in milliseconds) that was spent between the calls. Both take a string argument that identifies the measurement. For example: @@ -77,13 +80,14 @@ function f() { \endcode \section2 Trace +\keyword console trace \c console.trace prints the stack trace of the JavaScript execution at the point where it was called. The stack trace info contains the function name, file name, line number and column number. The stack trace is limited to last 10 stack frames. \section2 Count - +\keyword console count \c console.count prints the current number of times a particular piece of code has been executed, along with a message. That is, @@ -96,10 +100,11 @@ function f() { will print \c{f called: 1}, \c{f called: 2} ... whenever \c{f()} is executed. \section2 Profile - +\keyword console profile \c console.profile turns on the QML and JavaScript profilers. Nested calls are not supported and a warning will be printed to the console. +\keyword console profileEnd \c console.profileEnd turns off the QML and JavaScript profilers. Calling this function without a previous call to console.profile will print a warning to the console. A profiling client should have been attached before this call to receive and store the @@ -116,7 +121,7 @@ function f() { \endcode \section2 Exception - +\keyword console exception \c console.exception prints an error message together with the stack trace of JavaScript execution at the point where it is called. @@ -145,7 +150,8 @@ QQmlImportDatabase::resolveType "Rectangle" = "QDeclarativeRectangle" \endcode \section1 QML Debugging Infrastructure - +\keyword declarative_debug +\keyword qml debug The \l{Qt QML} module provides services for debugging, inspecting, and profiling applications via a TCP port. diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc index e06a3db9..d23a3fb0 100644 --- a/doc/src/snippets/code/doc_src_deployment.qdoc +++ b/doc/src/snippets/code/doc_src_deployment.qdoc @@ -41,7 +41,7 @@ //! [0] cd /path/to/Qt ./configure -static -prefix /path/to/Qt <other parameters> -make sub-src +make //! [0] |