diff options
Diffstat (limited to 'src/qml/doc/src/cppintegration')
4 files changed, 9 insertions, 9 deletions
diff --git a/src/qml/doc/src/cppintegration/contextproperties.qdoc b/src/qml/doc/src/cppintegration/contextproperties.qdoc index b40eec7f6e..aaac43e470 100644 --- a/src/qml/doc/src/cppintegration/contextproperties.qdoc +++ b/src/qml/doc/src/cppintegration/contextproperties.qdoc @@ -77,7 +77,7 @@ QML code invokes a method on the object instance: \l{QML:Qt::formatDateTime}{Qt.formatDateTime()} and associated functions.) If the QML item needs to receive signals from the context property, it can connect to them using the -\l Connections element. For example, if \c ApplicationData has a signal named \c +\l Connections type. For example, if \c ApplicationData has a signal named \c dataChanged(), this signal can be connected to using an \c onDataChanged handler within a \l Connections object: diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc index 84eb4bb2cd..be5f26a865 100644 --- a/src/qml/doc/src/cppintegration/definetypes.qdoc +++ b/src/qml/doc/src/cppintegration/definetypes.qdoc @@ -168,7 +168,7 @@ are constructed and owned by the QQmlEngine, and will be destroyed when the engine is destroyed. A QObject singleton type can be interacted with in a manner simlar to any -other QObject or instantiated element, except that only one (engine constructed +other QObject or instantiated type, except that only one (engine constructed and owned) instance will exist, and it must be referenced by type name rather than id. Q_PROPERTYs of QObject singleton types may be bound to, and Q_INVOKABLE functions of QObject module APIs may be used in signal handler expressions. @@ -230,7 +230,7 @@ version of their type definition, \c root.x now resolves to a different value because \c root is also the \c id of the top level component. The author could specify that the new \c root property is available from a specific minor version. This permits new properties and features to be added to existing -elements without breaking existing programs. +types without breaking existing programs. The REVISION tag is used to mark the \c root property as added in revision 1 of the type. Methods such as Q_INVOKABLE's, signals and slots can also be @@ -263,7 +263,7 @@ qmlRegisterType<CppType,1>("MyTypes", 1, 1, "CppType") \c root is only available when \c MyTypes version 1.1 is imported. -For the same reason, new elements introduced in later versions should use +For the same reason, new types introduced in later versions should use the minor version argument of qmlRegisterType. This feature of the language allows for behavioural changes to be made diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc index 63c06e2706..247e60411f 100644 --- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc +++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc @@ -69,7 +69,7 @@ and \l {qtqml-cppintegration-definetypes.html}{Defining QML Types from C++}. A common task when extending QML is to provide a new QML type that supports some custom functionality beyond what is provided by the built-in \l {Qt Quick QML Types}{QtQuick types}. For example, this could be done to implement particular data models, or provide -elements with custom painting and drawing capabilities, or access system features +types with custom painting and drawing capabilities, or access system features like network programming that are not accessible through built-in QML features. In this tutorial, we will show how to use the C++ classes in the Qt Declarative @@ -210,8 +210,8 @@ Try out the example yourself with the updated code in Qt's \c examples/quick/tut \example quick/tutorials/extending/chapter3-bindings Property binding is a powerful feature of QML that allows values of different -elements to be synchronized automatically. It uses signals to notify and update -other elements' values when property values are changed. +types to be synchronized automatically. It uses signals to notify and update +other types' values when property values are changed. Let's enable property bindings for the \c color property. That means if we have code like this: @@ -245,7 +245,7 @@ Then, we emit this signal in \c setPieSlice(): It's important for \c setColor() to check that the color value has actually changed before emitting \c colorChanged(). This ensures the signal is not emitted unnecessarily and -also prevents loops when other elements respond to the value change. +also prevents loops when other types respond to the value change. The use of bindings is essential to QML. You should always add NOTIFY signals for properties if they are able to be implemented, so that your diff --git a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc index 04b278106f..15d98ec405 100644 --- a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc +++ b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc @@ -143,7 +143,7 @@ or QObject::setProperty() and QObject::property(): You should always use QObject::setProperty(), QQmlProperty or QMetaProperty::write() to change a QML property value, to ensure the QML engine is made aware of the property change. For example, say you have a -custom element \c PushButton with a \c buttonText property that internally +custom type \c PushButton with a \c buttonText property that internally reflects the value of a \c m_buttonText member variable. Modifying the member variable directly like this is not a good idea: |