diff options
| author | Maximilian Goldstein <max.goldstein@qt.io> | 2020-03-27 16:17:49 +0100 |
|---|---|---|
| committer | Maximilian Goldstein <max.goldstein@qt.io> | 2020-04-02 09:55:26 +0200 |
| commit | 4355673ace02d5473d51648d6745acc8f07f481a (patch) | |
| tree | bb642340727c0ddd0575bc487c74257a34fd39c5 | |
| parent | 8dfcc71953cd36370bcf19f537445e3766f39635 (diff) | |
Add doumentation for nullish coalescing
Fixes: QTBUG-83145
Task-number: QTBUG-81615
Change-Id: I87a2053aa560b434b6282f5dad852537ac0342cf
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | src/qml/doc/src/external-resources.qdoc | 4 | ||||
| -rw-r--r-- | src/qml/doc/src/javascript/hostenvironment.qdoc | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/qml/doc/src/external-resources.qdoc b/src/qml/doc/src/external-resources.qdoc index 17ac7693bc..c11174db43 100644 --- a/src/qml/doc/src/external-resources.qdoc +++ b/src/qml/doc/src/external-resources.qdoc @@ -76,3 +76,7 @@ \externalpage https://fontawesome.com/ \title Font Awesome */ +/*! + \externalpage https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Nullish_coalescing_operator + \title Nullish Coalescing +*/ diff --git a/src/qml/doc/src/javascript/hostenvironment.qdoc b/src/qml/doc/src/javascript/hostenvironment.qdoc index c22c392b80..bc75f843fb 100644 --- a/src/qml/doc/src/javascript/hostenvironment.qdoc +++ b/src/qml/doc/src/javascript/hostenvironment.qdoc @@ -42,6 +42,8 @@ Like a browser or server-side JavaScript environment, the QML runtime implements all of the built-in types and functions defined by the standard, such as Object, Array, and Math. The QML runtime implements the 7th edition of the standard. +Since Qt 5.15 \l{Nullish Coalescing} is also implemented in the QML runtime. + The standard ECMAScript built-ins are not explicitly documented in the QML documentation. For more information on their use, please refer to the ECMA-262 7th edition standard or one of the many online JavaScript reference and tutorial sites, such as the \l{W3Schools JavaScript Reference} (JavaScript Objects |