summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-05-19 23:36:07 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-05-19 23:36:07 (GMT)
commitcc51d0f166354ad5acdc5ce054a83a02eeb21229 (patch)
treeac566448f16a976003e7bc9849c290da85a883ac
parent06cfcc9c8a328648d1000cc9fb1767a1b3e4d013 (diff)
downloadQt-cc51d0f166354ad5acdc5ce054a83a02eeb21229.zip
Qt-cc51d0f166354ad5acdc5ce054a83a02eeb21229.tar.gz
Qt-cc51d0f166354ad5acdc5ce054a83a02eeb21229.tar.bz2
Fix docs.
-rw-r--r--doc/src/declarative/qmlforcpp.qdoc6
-rw-r--r--src/declarative/qml/qmlcontext.cpp4
-rw-r--r--src/declarative/qml/qmlengine.cpp4
3 files changed, 8 insertions, 6 deletions
diff --git a/doc/src/declarative/qmlforcpp.qdoc b/doc/src/declarative/qmlforcpp.qdoc
index e29b962..2898499 100644
--- a/doc/src/declarative/qmlforcpp.qdoc
+++ b/doc/src/declarative/qmlforcpp.qdoc
@@ -28,7 +28,8 @@
based on a simple declarative component description.
\code
- QmlComponent redRectangle("Rect { color: \"red\"; width: 100; height: 100 }");
+ QmlEngine engine;
+ QmlComponent redRectangle(&engine, "Rect { color: \"red\"; width: 100; height: 100 }");
for (int ii = 0; ii < 100; ++ii) {
QObject *rectangle = redRectangle.create();
// ... do something with the rectangle ...
@@ -581,7 +582,8 @@
\row
\o
\code
- QmlComponent component(xmlData);
+ QmlEngine engine;
+ QmlComponent component(&engine, qmlData);
QObject *object = component.create();
// Will print "Hello world!"
qDebug() << object->property("text2");
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index fa36eb1..ea72ebf 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -149,7 +149,7 @@ void QmlContextPrivate::addDefaultObject(QObject *object, Priority priority)
QmlContext context(engine.rootContext());
context.setContextProperty("myModel", modelData);
- QmlComponent component("ListView { model=myModel }");
+ QmlComponent component(&engine, "ListView { model=myModel }");
component.create(&context);
\endcode
@@ -176,7 +176,7 @@ void QmlContextPrivate::addDefaultObject(QObject *object, Priority priority)
QmlContext context(engine.rootContext());
context.addDefaultObject(&myDataSet);
- QmlComponent component("ListView { model=myModel }");
+ QmlComponent component(&engine, "ListView { model=myModel }");
component.create(&context);
\endcode
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 425cba4..c0ea463 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -425,8 +425,8 @@ bool QmlEnginePrivate::loadCache(QmlBasicScriptNodeCache &cache, const QString &
\code
QmlEngine engine;
- QmlComponent component("Text { text: \"Hello world!\" }");
- QFxItem *item = qobject_cast<QFxItem *>(component.create(&engine));
+ QmlComponent component(&engine, "Text { text: \"Hello world!\" }");
+ QFxItem *item = qobject_cast<QFxItem *>(component.create());
//add item to view, etc
...