diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/QmlChanges.txt | 2 | ||||
| -rw-r--r-- | src/declarative/util/qmlbind.cpp | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index b95faf3..3ef81f4 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -16,6 +16,7 @@ Rect -> Rectangle FocusRealm -> FocusScope FontFamily -> FontLoader Palette -> SystemPalette +Bind -> Binding Renamed properties: MouseRegion: xmin -> minimumX @@ -49,7 +50,6 @@ Pending Changes Renamed elements: RunScriptAction -> ScriptAction ParentChangeAction -> ParentAction -Bind -> Binding SetProperties -> PropertyChanges RunScript -> StateChangeScript SetAnchors -> AnchorChanges diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp index f3b5fa4..d18ef47 100644 --- a/src/declarative/util/qmlbind.cpp +++ b/src/declarative/util/qmlbind.cpp @@ -63,27 +63,27 @@ public: QmlNullableValue<QVariant> value; }; -QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Bind,QmlBind) +QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Binding,QmlBind) /*! - \qmlclass Bind QmlBind - \brief The Bind element allows arbitrary property bindings to be created. + \qmlclass Binding QmlBind + \brief The Binding element allows arbitrary property bindings to be created. Sometimes it is necessary to bind to a property of an object that wasn't directly instantiated by QML - generally a property of a class exported - to QML by C++. In these cases, regular property binding doesn't work. Bind + to QML by C++. In these cases, regular property binding doesn't work. Binding allows you to bind any value to any property. For example, imagine a C++ application that maps an "app.enteredText" - property into QML. You could use Bind to update the enteredText property + property into QML. You could use Binding to update the enteredText property like this. \code TextEdit { id: myTextField; text: "Please type here..." } - Bind { target: app; property: "enteredText"; value: myTextField.text /> + Binding { target: app; property: "enteredText"; value: myTextField.text } \endcode Whenever the text in the TextEdit is updated, the C++ property will be updated also. - If the bind target or bind property is changed, the bound value is + If the binding target or binding property is changed, the bound value is immediately pushed onto the new target. \sa {qmlforcpp}{Qt Declarative Markup Language For C++ Programmers} @@ -123,7 +123,7 @@ void QmlBind::setWhen(bool v) } /*! - \qmlproperty Object Bind::target + \qmlproperty Object Binding::target The object to be updated. */ @@ -141,7 +141,7 @@ void QmlBind::setObject(QObject *obj) } /*! - \qmlproperty string Bind::property + \qmlproperty string Binding::property The property to be updated. */ @@ -159,7 +159,7 @@ void QmlBind::setProperty(const QString &p) } /*! - \qmlproperty any Bind::value + \qmlproperty any Binding::value The value to be set on the target object and property. This can be a constant (which isn't very useful), or a bound expression. |