diff options
author | Leena Miettinen <riitta-leena.miettinen@digia.com> | 2012-11-20 10:54:32 +0100 |
---|---|---|
committer | Leena Miettinen <riitta-leena.miettinen@digia.com> | 2012-11-20 14:43:54 +0100 |
commit | dd8396ed06bf18a0c0fab62bacaec891b1891e32 (patch) | |
tree | c514bc0d8f14574fa2949028060d49eec5a07c90 /doc | |
parent | c03182e428e65f6ee1ca20e79fb2fa93dea34cad (diff) |
Doc: using QML Scene for Qt 5 and Qt Quick 2
Task-number: QTCREATORBUG-8170
Change-Id: I2d1a2635b1efe820390084d20712c1fd9961276e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/howto/creator-external-tools.qdoc | 14 | ||||
-rw-r--r-- | doc/src/overview/creator-advanced.qdoc | 3 | ||||
-rw-r--r-- | doc/src/projects/creator-projects-creating.qdoc | 5 | ||||
-rw-r--r-- | doc/src/qtquick/qtquick-creating.qdoc | 3 |
4 files changed, 14 insertions, 11 deletions
diff --git a/doc/src/howto/creator-external-tools.qdoc b/doc/src/howto/creator-external-tools.qdoc index ac1f5faf92..2ea158b022 100644 --- a/doc/src/howto/creator-external-tools.qdoc +++ b/doc/src/howto/creator-external-tools.qdoc @@ -31,7 +31,7 @@ \title Using External Tools You can use external tools directly from \QC. Qt Linguist, - QML Viewer, the + QML preview tools, the default text editor for your system, and the \c sort tool are preconfigured for use. You can change their default configurations and configure new tools. @@ -59,14 +59,14 @@ \l{http://qt-project.org/doc/qt-4.8/linguist-manual.html} {Qt Linguist Manual}. - \section1 Using QML Viewer + \section1 Previewing QML Files - You can preview the current QML document in the QML Viewer. The QML Viewer - invokes the QML runtime to load QML documents and also includes additional - features useful for the development of QML-based applications. + You can preview the current QML document in the QML Viewer (Qt Quick 1) or + QML Scene (Qt Quick 2). The preview tools enable you to load QML documents + for viewing and testing while you are developing an application. - To preview the currently active QML file, select \gui {Tools > External > - Qt Quick > Preview (qmlviewer)}. + To preview the currently active QML file, select \gui Tools > \gui External + > \gui {Qt Quick} > \gui {Preview (qmlviewer)} or \gui {Preview (qmlscene)}. \section1 Using External Text Editors diff --git a/doc/src/overview/creator-advanced.qdoc b/doc/src/overview/creator-advanced.qdoc index 12f5bbe8aa..78693a7afc 100644 --- a/doc/src/overview/creator-advanced.qdoc +++ b/doc/src/overview/creator-advanced.qdoc @@ -71,7 +71,8 @@ \o \l{Using External Tools} You can use external tools directly from \QC. Qt Linguist, - QML Viewer, the default text editor for your system, and the \c sort + QML preview tools (QML Viewer and QML Scene), the default text + editor for your system, and the \c sort tool are preconfigured for use. You can change their default configurations and configure new tools. diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index b23504aea4..21b9bd5e60 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -141,8 +141,9 @@ \o Qt Quick UI - Use a single QML file that contains the main view. You can run - Qt Quick UI projects in the QML Viewer and you need not build + Use a single QML file that contains the main view. You can + review Qt Quick UI projects in a \l{Previewing QML Files} + {preview tool} and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of projects diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index 00588530ee..623b84961c 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -59,7 +59,8 @@ develop for platforms that run Qt 5. \o \gui {Qt Quick UI} creates a Qt Quick UI project with a single QML file that contains the main view. You can review Qt Quick UI - projects in the QML Viewer and you need not build them. You do not + projects in a \l{Previewing QML Files}{preview tool} and you need + not build them. You do not need to have the development environment installed on your computer to create and run this type of projects. |