diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-20 16:34:45 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-20 16:34:45 (GMT) |
| commit | e4b0fe70c6435bb860df526d615dfdf53dfb5abd (patch) | |
| tree | bfe3dd860c1fa2f7df3c79cfd970c10c2133dac2 /doc | |
| parent | 2ebbfad45ca02ee4e623e592621231d33f1032e5 (diff) | |
| parent | c849ddd06371e5a6455c63d67a14171ac06bf9d4 (diff) | |
| download | Qt-e4b0fe70c6435bb860df526d615dfdf53dfb5abd.zip Qt-e4b0fe70c6435bb860df526d615dfdf53dfb5abd.tar.gz Qt-e4b0fe70c6435bb860df526d615dfdf53dfb5abd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/getting-started/examples.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/snippets/declarative/keys/keys-handler.qml | 2 | ||||
| -rw-r--r-- | doc/src/snippets/declarative/keys/keys-pressed.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index aa0b695..851e161 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -36,7 +36,7 @@ You can run the examples from the \l{Examples and Demos Launcher} application (except see \l{QML Examples and Demos} {QML Examples} - for special instructions for running thos examples). + for special instructions for running those examples). The examples are listed below by functional area. Each example listed in a particular functional area is meant to illustrate how diff --git a/doc/src/snippets/declarative/keys/keys-handler.qml b/doc/src/snippets/declarative/keys/keys-handler.qml index 9e3a3b4..be0eedb 100644 --- a/doc/src/snippets/declarative/keys/keys-handler.qml +++ b/doc/src/snippets/declarative/keys/keys-handler.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 Item { width: 400; height: 400 diff --git a/doc/src/snippets/declarative/keys/keys-pressed.qml b/doc/src/snippets/declarative/keys/keys-pressed.qml index 523c95b..90a4e37 100644 --- a/doc/src/snippets/declarative/keys/keys-pressed.qml +++ b/doc/src/snippets/declarative/keys/keys-pressed.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 Item { width: 400; height: 400 |