aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2020-08-29 18:58:02 +0800
committerSze Howe Koh <szehowe.koh@gmail.com>2020-08-30 09:59:49 +0800
commit024ec9c564abfbe9aadd2193deeaa0d37464119a (patch)
tree7824246c940d8fae9bbe2a87ffc4ace055c67e6b /src
parent3cf3434c1a898c834b2f0f6182068bbf8a95b9bc (diff)
Doc: Fix minor typos
Pick-to: 5.15 Change-Id: I4c51c40697e410d56b6a2d2446ed9f8ae218576d Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
Diffstat (limited to 'src')
-rw-r--r--src/qml/jsapi/qjsvalue.cpp2
-rw-r--r--src/qml/qml/v8/qqmlbuiltinfunctions.cpp2
-rw-r--r--src/quick/items/qquicktableview.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp
index 4a1833be51..fe388f3b52 100644
--- a/src/qml/jsapi/qjsvalue.cpp
+++ b/src/qml/jsapi/qjsvalue.cpp
@@ -415,7 +415,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 cbcbf1da19..d0f049039b 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -1164,7 +1164,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 29b279c8ef..0a1bfb9b08 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.