diff options
author | David Boddie <david.boddie@nokia.com> | 2010-10-04 14:12:39 (GMT) |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2010-10-04 14:12:39 (GMT) |
commit | 3ea28c383846a4af67ddd0c7d33dad0537a9972e (patch) | |
tree | 901f26b86b820ec4b4fc949ae38b6ce165b386af /doc/src/declarative/scope.qdoc | |
parent | 7cc2e423d39c3b519279d21cd3881f1a135913fd (diff) | |
parent | d04664b9da6356d3c97e632fb35e27c6822e0dc9 (diff) | |
download | Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.zip Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.gz Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc/src/declarative/scope.qdoc')
-rw-r--r-- | doc/src/declarative/scope.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/declarative/scope.qdoc b/doc/src/declarative/scope.qdoc index c702c91..b7ce539 100644 --- a/doc/src/declarative/scope.qdoc +++ b/doc/src/declarative/scope.qdoc @@ -112,7 +112,7 @@ following example shows a simple QML file that accesses some enumeration values and calls an imported JavaScript function. \code -import Qt 4.7 +import QtQuick 1.0 import "code.js" as Code ListView { @@ -253,7 +253,7 @@ is used, the \c title property may resolve differently. \code // TitlePage.qml -import Qt 4.7 +import QtQuick 1.0 Item { property string title @@ -269,7 +269,7 @@ Item { } // TitleText.qml -import Qt 4.7 +import QtQuick 1.0 Text { property int size text: "<b>" + title + "</b>" @@ -285,7 +285,7 @@ to use property interfaces, like this: \code // TitlePage.qml -import Qt 4.7 +import QtQuick 1.0 Item { id: root property string title @@ -304,7 +304,7 @@ Item { } // TitleText.qml -import Qt 4.7 +import QtQuick 1.0 Text { property string title property int size |