diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-09-12 18:29:45 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-09-12 18:29:45 +0300 |
| commit | da0aac1057552048f59075beb31861a6cc076684 (patch) | |
| tree | 020cd8784f01248ea051bbf70254b8bcb3100a23 /src/qml/qml/qqmlexpression.cpp | |
| parent | f274d775774b78f6217c9770ae87045d969acbe1 (diff) | |
| parent | 4757cac470edbeaeaceca4e63075d9f1139f546b (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into tqtc/lts-5.15-opensourcev5.15.7-lts-lgpl
Change-Id: I658cff3c394ed233005efe6b12c515d2a886ef6b
Diffstat (limited to 'src/qml/qml/qqmlexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmlexpression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp index f6a5afb891..e9f8bce942 100644 --- a/src/qml/qml/qqmlexpression.cpp +++ b/src/qml/qml/qqmlexpression.cpp @@ -204,7 +204,7 @@ QQmlExpression::~QQmlExpression() } /*! - Returns the QQmlEngine this expression is associated with, or 0 if there + Returns the QQmlEngine this expression is associated with, or \nullptr if there is no association or the QQmlEngine has been destroyed. */ QQmlEngine *QQmlExpression::engine() const @@ -214,7 +214,7 @@ QQmlEngine *QQmlExpression::engine() const } /*! - Returns the QQmlContext this expression is associated with, or 0 if there + Returns the QQmlContext this expression is associated with, or \nullptr if there is no association or the QQmlContext has been destroyed. */ QQmlContext *QQmlExpression::context() const |