diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-10-01 05:28:48 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-10-01 05:28:48 (GMT) |
| commit | dcc5c7ea047513ceb6fc75aac526b17ad6629d4c (patch) | |
| tree | eb35c11d8ed04c467a1bfee1fe6da06f93fe686d /doc/src/getting-started/gettingstartedqml.qdoc | |
| parent | 94aa8a639de93861cfafef2e195616cb8ee52093 (diff) | |
| download | Qt-dcc5c7ea047513ceb6fc75aac526b17ad6629d4c.zip Qt-dcc5c7ea047513ceb6fc75aac526b17ad6629d4c.tar.gz Qt-dcc5c7ea047513ceb6fc75aac526b17ad6629d4c.tar.bz2 | |
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
(cherry picked from commit 49452ad6b22e080b1dfdfde38c21c48bb910a1ae)
Conflicts:
tests/auto/declarative/qdeclarativeconnection/data/error-object.qml
tests/auto/declarative/qdeclarativeconnection/data/error-property.qml
tests/auto/declarative/qdeclarativeconnection/data/error-property2.qml
tests/auto/declarative/qdeclarativeconnection/data/error-syntax.qml
tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
tests/auto/declarative/qdeclarativeqt/data/quit.qml
tests/auto/declarative/qdeclarativeview/data/error1.qml
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 a5e45d9..e2d6e72 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 |