diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-14 04:26:32 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-14 04:26:32 (GMT) |
| commit | 799380ea82ced8cc5eb4eed5b1306748125331fa (patch) | |
| tree | 41140bd1687211ae305f7b0e0f1cd2d413db3c94 /doc | |
| parent | a093c5ef65aa2c28f52f78c8be5bbe7d567646fa (diff) | |
| parent | 59b3e3ba52891197510115f912e7934ac1784d7c (diff) | |
| download | Qt-799380ea82ced8cc5eb4eed5b1306748125331fa.zip Qt-799380ea82ced8cc5eb4eed5b1306748125331fa.tar.gz Qt-799380ea82ced8cc5eb4eed5b1306748125331fa.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/parser/qmljsparser.cpp
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/binding.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/declarative/qmlforcpp.qdoc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/declarative/binding.qdoc b/doc/src/declarative/binding.qdoc index 2920d51..e74e4b1 100644 --- a/doc/src/declarative/binding.qdoc +++ b/doc/src/declarative/binding.qdoc @@ -90,7 +90,7 @@ QFxView *view = new QFxView; view->setUrl("MyUI.qml"); MyScreen *screen = new MyScreen; -QmlBindContext *ctxt = view->rootContext(); +QmlContext *ctxt = view->rootContext(); ctxt->setContextProperty("screen", screen); view->execute(); diff --git a/doc/src/declarative/qmlforcpp.qdoc b/doc/src/declarative/qmlforcpp.qdoc index 38f5665..c0d1b7d 100644 --- a/doc/src/declarative/qmlforcpp.qdoc +++ b/doc/src/declarative/qmlforcpp.qdoc @@ -233,7 +233,7 @@ structures. Every expression is executed in a bind context, encapsulated by the - QmlBindContext C++ class. As covered in the class documentation, a + QmlContext C++ class. As covered in the class documentation, a bind context contains a map of names to values, and a list of default objects. When resolving a name, the name to value map is searched first. If the name cannot be found, the default object's are iterated in turn and @@ -331,7 +331,7 @@ } \endcode - To relate id's back to QmlBindContext, id's exist as properties on the + To relate id's back to QmlContext, id's exist as properties on the component context. Bind expressions can reference any object property. The QML bind engine |