diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-12 20:49:36 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-12 20:49:45 +0200 |
commit | b4cdfc4a12d2b9ebc79fe17a2f1aff67bd940d71 (patch) | |
tree | e7841ee2695a3ef180e186d2df971c8fc207d0f9 /src/qml/doc | |
parent | 650b5db06b057abe2db40fb8d56223e17ba8c06a (diff) | |
parent | af002b8df9b084fd7f26e9eead9844aab36bdc4d (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib31008e593442ca5813fb14ae6b02f7ab2577395
Diffstat (limited to 'src/qml/doc')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/doc/src/cppclasses/topic.qdoc b/src/qml/doc/src/cppclasses/topic.qdoc index ddb29fbb14..133f9bc72c 100644 --- a/src/qml/doc/src/cppclasses/topic.qdoc +++ b/src/qml/doc/src/cppclasses/topic.qdoc @@ -91,7 +91,7 @@ at run-time using a QQmlComponent. An instance of the QQmlComponent class can be created in C++ directly, or via the \l{QtQml::Qt::createComponent()} {Qt.createComponent()} function in imperative QML code. Arbitrary expressions can be calculated in C++ via the QQmlExpression class, and such expressions -can interact directly the QML context. +can interact directly with the QML context. \section2 The QQmlComponent Class @@ -106,7 +106,7 @@ how to use QQmlComponent. The QQmlExpression class provides a way for clients to evaluate JavaScript expressions from C++, using a particular QML evaluation context. This allows -clients to access QML objects by id, for example. The result of evaluation +clients to access QML objects by id, for example. The result of the evaluation is returned as a QVariant, and the conversion rules are defined by the QML engine. diff --git a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc index f5aea0b01a..ed0d049564 100644 --- a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc +++ b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc @@ -71,7 +71,7 @@ type that is supported by the QML engine. By default, the engine supports a number of Qt C++ types and can automatically convert them as appropriately when used from QML. Additionally, C++ classes that are \l{Registering C++ types with the QML type system}{registered} with -the QML type system can be can be used as data types, as can their enums if +the QML type system can be used as data types, as can their enums if appropriately registered. See \l{qtqml-cppintegration-data.html}{Data Type Conversion Between QML and C++} for further information. diff --git a/src/qml/doc/src/qmllanguageref/documents/scope.qdoc b/src/qml/doc/src/qmllanguageref/documents/scope.qdoc index 3e3bbaca98..eaf1747a6d 100644 --- a/src/qml/doc/src/qmllanguageref/documents/scope.qdoc +++ b/src/qml/doc/src/qmllanguageref/documents/scope.qdoc @@ -105,7 +105,7 @@ ListView { \section1 Binding Scope Object -An object which has a \l{Property Binding}{property binding} is known has the +An object which has a \l{Property Binding}{property binding} is known as the binding's \e{scope object}. In the following example, the \l Item object is the binding's scope object. diff --git a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc index db9eee7714..030eb72b5f 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc @@ -191,7 +191,7 @@ which was then imported by the client), then a property of type \section3 Assigning Values to Property Attributes -The value of a property of an object instance may specified in two separate ways: +The value of a property of an object instance may be specified in two separate ways: \list \li a value assignment on initialization \li an imperative value assignment |