diff options
author | Martin Smith <msmith@trolltech.com> | 2010-04-13 08:20:16 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2010-04-13 08:20:16 (GMT) |
commit | add41080b9a4e2319007063bd73447f336933e9e (patch) | |
tree | 2b5bcbf18d4a0b3dc96043a430830c8212e85749 /doc/src/declarative/qtbinding.qdoc | |
parent | 1055099e331af3b10d0b81b1a965e7d3db5f272d (diff) | |
parent | fbacd0fb2eb41470b090a3cbca7535f78689a382 (diff) | |
download | Qt-add41080b9a4e2319007063bd73447f336933e9e.zip Qt-add41080b9a4e2319007063bd73447f336933e9e.tar.gz Qt-add41080b9a4e2319007063bd73447f336933e9e.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src/declarative/qtbinding.qdoc')
-rw-r--r-- | doc/src/declarative/qtbinding.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/declarative/qtbinding.qdoc b/doc/src/declarative/qtbinding.qdoc index 577e69a..181c504 100644 --- a/doc/src/declarative/qtbinding.qdoc +++ b/doc/src/declarative/qtbinding.qdoc @@ -108,7 +108,7 @@ QObject *window = component.create(windowContext); \o \code // main.qml -import Qt 4.6 +import Qt 4.7 Rectangle { color: backgroundColor @@ -198,7 +198,7 @@ the window text will update accordingly. \code // main.qml -import Qt 4.6 +import Qt 4.7 Rectangle { width: 240 @@ -287,7 +287,7 @@ int main(int argc, char **argv) \o \code // main.qml -import Qt 4.6 +import Qt 4.7 Rectangle { MouseArea { @@ -311,7 +311,7 @@ is to have a "running" property. This leads to much nicer QML code: \o \code // main.qml -import Qt 4.6 +import Qt 4.7 Rectangle { MouseArea { @@ -390,7 +390,7 @@ MyApplication::MyApplication() \endcode \code // main.qml -import Qt 4.6 +import Qt 4.7 Image { source: "images/background.png" |