diff options
author | Martin Smith <martin.smith@nokia.com> | 2010-10-04 11:40:45 (GMT) |
---|---|---|
committer | Martin Smith <martin.smith@nokia.com> | 2010-10-04 11:40:45 (GMT) |
commit | 6f811c74237c4c4b3618fa879253435f1bb5b7a6 (patch) | |
tree | b10925754df0608beb5de941b5c1ea4da1f3bd55 /doc/src/declarative/scope.qdoc | |
parent | f7be8a1ccd69c34c1f2406be625e2c60901d8e9e (diff) | |
parent | 9d0317c91dbbe660af2ed2aa8ea47446049467d2 (diff) | |
download | Qt-6f811c74237c4c4b3618fa879253435f1bb5b7a6.zip Qt-6f811c74237c4c4b3618fa879253435f1bb5b7a6.tar.gz Qt-6f811c74237c4c4b3618fa879253435f1bb5b7a6.tar.bz2 |
Merge branch '4.7' of git@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 363ba8d..5501242 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 |