summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/declarative/createQmlObject.qml
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-10 22:42:55 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-10 22:42:55 +0200
commit0afb2e2ba1b3a83e888b8b584c14e92dffb02596 (patch)
treeeded7c252bf19b1f60cbbec993c7e6b76c13d327 /doc/src/snippets/declarative/createQmlObject.qml
parent497da277770ccf37e05a7b519afd5206601a7cf1 (diff)
parent1546eeb7379ba7805c9f1a467fbc7e31dd377bab (diff)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (42 commits) Update on color change. Update on color change. Add go button to webbrowser example. Remove 'XXX Experimental' from VisualItemModel/VisualDataModel and Document attached properties Add 'on' prefix to documentation of signals Stablize qmlviewer test Improve test stability. qmlviewer: ensure that only clicks on the current file list are handled. Doc improvements: move some example code to snippets, add screenshots, Move some example code into snippets/ and add other doc fixes Fix crash when changing ListView model with highlightRangeMode: ListView.StrictlyEnforceRange Fix GridView bounds behavior with snapping enabled. Small optimization when checking if MouseArea's onPressAndHold is Fix autotest. Fixed `nmake clean' breaking declarative imports on Windows. Fix drawing flicker on Qml Viewer startup Fix snake demo Add qmlmethod Item::childAt() to delarative item Cursor positioning in QTextDocument after undo() ...
Diffstat (limited to 'doc/src/snippets/declarative/createQmlObject.qml')
-rw-r--r--doc/src/snippets/declarative/createQmlObject.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/declarative/createQmlObject.qml b/doc/src/snippets/declarative/createQmlObject.qml
index f2ac6e6b1b..f274e40f34 100644
--- a/doc/src/snippets/declarative/createQmlObject.qml
+++ b/doc/src/snippets/declarative/createQmlObject.qml
@@ -42,7 +42,7 @@
import Qt 4.7
Rectangle {
- id: targetItem
+ id: parentItem
property QtObject newObject
width: 100
@@ -51,7 +51,7 @@ Rectangle {
function createIt() {
//![0]
newObject = Qt.createQmlObject('import Qt 4.7; Rectangle {color: "red"; width: 20; height: 20}',
- targetItem, "dynamicSnippet1");
+ parentItem, "dynamicSnippet1");
//![0]
}