diff options
| author | Leena Miettinen <riitta-leena.miettinen@digia.com> | 2012-09-28 15:39:42 +0200 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@digia.com> | 2012-09-28 16:07:25 +0200 |
| commit | aeca8714b56f9b0e4a31574dc37947b7c595eb24 (patch) | |
| tree | 98a4af3c688d1bf4a0a795bbc6a0e50bbbef1583 /doc | |
| parent | bbe08f156da7821c797acd85227633f1b4fac435 (diff) | |
Doc: the Qt Quick 2 application wizard
Change-Id: I586a669995ca173648783bed2f1e6ea675aacda3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/images/qmldesigner-new-project.png | bin | 20287 -> 42644 bytes | |||
| -rw-r--r-- | doc/images/qtcreator-new-qt-quick-project-wizard.png | bin | 20073 -> 42874 bytes | |||
| -rw-r--r-- | doc/src/projects/creator-projects-creating.qdoc | 7 | ||||
| -rw-r--r-- | doc/src/qtquick/qtquick-creating.qdoc | 18 |
4 files changed, 12 insertions, 13 deletions
diff --git a/doc/images/qmldesigner-new-project.png b/doc/images/qmldesigner-new-project.png Binary files differindex ac8e4e1505..acbbc37893 100644 --- a/doc/images/qmldesigner-new-project.png +++ b/doc/images/qmldesigner-new-project.png diff --git a/doc/images/qtcreator-new-qt-quick-project-wizard.png b/doc/images/qtcreator-new-qt-quick-project-wizard.png Binary files differindex 9c318c9390..1bd69f0564 100644 --- a/doc/images/qtcreator-new-qt-quick-project-wizard.png +++ b/doc/images/qtcreator-new-qt-quick-project-wizard.png diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index e28850ea92..211a129df7 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -116,9 +116,10 @@ \o Qt Quick Application (Built-in Elements) - Use built-in QML elements to design Qt Quick based user - interfaces with a custom look and feel and QML and C++ code to - implement the application logic + Use built-in QML elements to design user interfaces based on + Qt Quick 1 (Qt 4.7.1, or later) or Qt Quick 2 (Qt 5) with a + custom look and feel and QML and C++ code to implement the + application logic \o Qt Quick Application for MeeGo Harmattan diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index 27d87db53a..80763000a4 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -50,6 +50,14 @@ custom look and feel, whereas the components provide the look and feel for a particular platform. + The Qt Quick 1 Application wizard imports Qt Quick 1.1, and + therefore, you can use it without changes to develop for platforms + that run Qt 4.7.4 (such as MeeGo). To develop for platforms that run + Qt 4.7.3 (such as Maemo), you must change the import statement to + import Qt Quick 1.0. + + The Qt Quick 2 Application wizard imports Qt Quick 2.0. Use it to + 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 @@ -68,16 +76,6 @@ \endlist - \if defined(qcmanual) - \note Qt 4.7.3 supports Qt Quick 1.0 and Qt 4.7.4 supports Qt Quick 1.1. The - application wizards import Qt Quick 1.1, and therefore, you can use them - without changes if you target only platforms that run Qt 4.7.4 (such as - MeeGo or the desktop). If you also target platforms that run Qt 4.7.3 - (such as Maemo), you must change the import statement to - import Qt Quick 1.0. - \endif - - \section1 Creating Qt Quick UI Projects \list 1 |
