diff options
| -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 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. |