diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-04 14:12:39 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-04 14:12:39 (GMT) |
| commit | 3ea28c383846a4af67ddd0c7d33dad0537a9972e (patch) | |
| tree | 901f26b86b820ec4b4fc949ae38b6ce165b386af /doc/src/getting-started/gettingstartedqml.qdoc | |
| parent | 7cc2e423d39c3b519279d21cd3881f1a135913fd (diff) | |
| parent | d04664b9da6356d3c97e632fb35e27c6822e0dc9 (diff) | |
| download | Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.zip Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.gz Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc/src/getting-started/gettingstartedqml.qdoc')
| -rw-r--r-- | doc/src/getting-started/gettingstartedqml.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc index 5e4a94f..9d4f6a7 100644 --- a/doc/src/getting-started/gettingstartedqml.qdoc +++ b/doc/src/getting-started/gettingstartedqml.qdoc @@ -73,7 +73,7 @@ \snippet examples/tutorials/gettingStarted/gsQml/part0/Button.qml document - First, the \c { import Qt 4.7 } allows the qmlviewer tool to import the QML elements + First, the \c { import QtQuick 1.0 } allows the qmlviewer tool to import the QML elements we will later use. This line must exist for every QML file. Notice that the version of Qt modules is included in the import statement. @@ -209,7 +209,7 @@ \c FileMenu.qml. \code - import Qt 4.7 \\import the main Qt QML module + import QtQuick 1.0 \\import the main Qt QML module import "folderName" \\import the contents of the folder import "script.js" as Script \\import a Javascript file and name it as Script \endcode |