diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-15 22:00:22 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-15 22:00:22 (GMT) |
| commit | 0b47cfe1163598bbc3e867073fb1b7c5b238fe73 (patch) | |
| tree | cc5cf8846f8c9c670a2354070e47e0ad09f71cc0 /doc | |
| parent | e7b372e4705451dfd4443db7e6fc64d4b8f30c68 (diff) | |
| parent | 4d9d3ed84c3bf1f6d08a9ddd36f834b9c8972b38 (diff) | |
| download | Qt-0b47cfe1163598bbc3e867073fb1b7c5b238fe73.zip Qt-0b47cfe1163598bbc3e867073fb1b7c5b238fe73.tar.gz Qt-0b47cfe1163598bbc3e867073fb1b7c5b238fe73.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/snippets/declarative/keys/keys-handler.qml | 2 | ||||
| -rw-r--r-- | doc/src/snippets/declarative/keys/keys-pressed.qml | 2 |
2 files changed, 2 insertions, 2 deletions
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 |