diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2020-08-29 18:58:02 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-08-30 03:26:09 +0000 |
| commit | fce721c9224ad83898a2ddf8c4aa40b795dc6f77 (patch) | |
| tree | 25f7c489a37ba8c050996181759198397c840643 | |
| parent | e42e7b39603296afb711b81b8214c0576617684b (diff) | |
Doc: Fix minor typos
Change-Id: I4c51c40697e410d56b6a2d2446ed9f8ae218576d
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
(cherry picked from commit 024ec9c564abfbe9aadd2193deeaa0d37464119a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquicktableview.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc b/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc index 752836e524..f24d1ae636 100644 --- a/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc +++ b/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc @@ -31,7 +31,7 @@ \image qml-xmlhttprequest-example.png \e XMLHttpRequest contains a small QML example demonstrating \l{Qt QML}'s - XMLHTTPRequest functionality. For more information, visit the section about + XMLHttpRequest functionality. For more information, visit the section about \l{QML Global Object#XMLHttpRequest}{XMLHttpRequest}. \include examples-run.qdocinc diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index b40bc1f18b..c2bf5c411d 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -473,7 +473,7 @@ bool QJSValue::isObject() const } /*! - Returns true if this QJSValue can be called a function, otherwise + Returns true if this QJSValue is a function, otherwise returns false. \sa call() diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 445af48ca4..0aa7e3b88d 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -1126,7 +1126,7 @@ Example (where \c parentItem is the id of an existing QML item): \snippet qml/createQmlObject.qml 0 -In the case of an error, a \l {Qt Script} Error object is thrown. This object has an additional property, +In the case of an error, a QQmlError object is thrown. This object has an additional property, \c qmlErrors, which is an array of the errors encountered. Each object in this array has the members \c lineNumber, \c columnNumber, \c fileName and \c message. For example, if the above snippet had misspelled color as 'colro' then the array would contain an object like the following: diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp index 339d45cad8..89a1e1ce2a 100644 --- a/src/quick/items/qquicktableview.cpp +++ b/src/quick/items/qquicktableview.cpp @@ -205,7 +205,7 @@ \qmlproperty int QtQuick::TableView::columns \readonly - This property holds the number of rows in the table. + This property holds the number of columns in the table. \note \a columns is usually equal to the number of columns in the model, but can temporarily differ until all pending model changes have been processed. |