diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-15 04:02:27 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-15 04:02:27 (GMT) |
| commit | d9a46ef84fcf5b460cb69d9b27c81e6bd6e0a685 (patch) | |
| tree | 4be56bcf9496666e70d5d2b2a7ef92c1b1a68fe8 /doc/src/declarative | |
| parent | 7d49812197294dc0cb33e1ad0bd2d56e3557040a (diff) | |
| parent | 68e47e91af6edca3c714cc3258b65dd88c0ee1e4 (diff) | |
| download | Qt-d9a46ef84fcf5b460cb69d9b27c81e6bd6e0a685.zip Qt-d9a46ef84fcf5b460cb69d9b27c81e6bd6e0a685.tar.gz Qt-d9a46ef84fcf5b460cb69d9b27c81e6bd6e0a685.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv
Conflicts:
src/declarative/canvas/qsimplecanvas.cpp
src/declarative/canvas/qsimplecanvasdebugplugin.cpp
src/declarative/canvas/qsimplecanvasdebugplugin_p.h
src/declarative/fx/qfxpainteditem.cpp
src/declarative/util/qfxview.cpp
tools/qmlviewer/qmlviewer.h
Diffstat (limited to 'doc/src/declarative')
| -rw-r--r-- | doc/src/declarative/binding.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/declarative/modules.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/declarative/qmlforcpp.qdoc | 4 |
3 files changed, 4 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/modules.qdoc b/doc/src/declarative/modules.qdoc index 194be40..60cf2a4 100644 --- a/doc/src/declarative/modules.qdoc +++ b/doc/src/declarative/modules.qdoc @@ -25,6 +25,7 @@ The import statement cannot be used by remote content. Ideas for full module support.... +See QT-558. * Modularity within applications 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 |