diff options
| author | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-10-12 13:53:46 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-10-12 13:53:46 (GMT) |
| commit | 267bee03092c316860ad9f4025c2f527c82b10d7 (patch) | |
| tree | 7722009b7ef351caa926220e4048591dbd7ed374 /doc/src/snippets/declarative/codingconventions/javascript.qml | |
| parent | 76e1b6a93a36080e39c3d1e7cb1e754aa0131999 (diff) | |
| parent | ac19a3409253f5f74984624b99268212ba74c086 (diff) | |
| download | Qt-267bee03092c316860ad9f4025c2f527c82b10d7.zip Qt-267bee03092c316860ad9f4025c2f527c82b10d7.tar.gz Qt-267bee03092c316860ad9f4025c2f527c82b10d7.tar.bz2 | |
Merge branch 'master' of ../qt-stg2-master into lancelot
Diffstat (limited to 'doc/src/snippets/declarative/codingconventions/javascript.qml')
| -rw-r--r-- | doc/src/snippets/declarative/codingconventions/javascript.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/declarative/codingconventions/javascript.qml b/doc/src/snippets/declarative/codingconventions/javascript.qml index fd19b02..6c94626 100644 --- a/doc/src/snippets/declarative/codingconventions/javascript.qml +++ b/doc/src/snippets/declarative/codingconventions/javascript.qml @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 Rectangle { |