diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2016-05-24 08:48:26 +0200 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2016-05-26 09:56:50 +0000 |
| commit | 32ff202a79d6d553edc52bc81c6e02e14d744315 (patch) | |
| tree | 7c388de91536705ce9b0698d6c0c535c0f39bf56 | |
| parent | b1e9290b73b3173c79f707f8451a79c68fe49dd6 (diff) | |
| download | qt-creator-32ff202a79d6d553edc52bc81c6e02e14d744315.tar.gz | |
Doc: Describe Qt Quick Controls 2 Application wizard
Update screenshots.
Change-Id: I6069e08113cae83142d249e3f331586acce63ca9
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
| -rw-r--r-- | doc/images/qmldesigner-new-project.png | bin | 15439 -> 19612 bytes | |||
| -rw-r--r-- | doc/images/qtcreator-new-qt-quick-project-wizard.png | bin | 15975 -> 19640 bytes | |||
| -rw-r--r-- | doc/src/projects/creator-projects-creating.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/qtquick/qtquick-creating.qdoc | 9 |
4 files changed, 10 insertions, 5 deletions
diff --git a/doc/images/qmldesigner-new-project.png b/doc/images/qmldesigner-new-project.png Binary files differindex 3d8e5265f0..57c53d8bd4 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 508403303d..f253468592 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 05a8969a8d..f02ec75d52 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -120,10 +120,12 @@ \li Qt Quick Controls Application Create a Qt Quick application using + \l{http://doc-snapshots.qt.io/qt5-5.7/qtquickcontrols2-index.html} + {Qt Quick Controls 2} (requires Qt 5.7 or later), \l{http://doc.qt.io/qt-5/qtquickcontrols-index.html} - {Qt Quick Controls} or + {Qt Quick Controls}, or \l{http://doc.qt.io/qt-5/qtlabscontrols-index.html} - {Qt Labs Controls} + {Qt Labs Controls} (only for Qt 5.6) \li Qt Canvas 3D Application diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index 8d8adad80f..2b4d8c85cc 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -50,13 +50,16 @@ a QQuickView. You can build the application and deploy it to desktop, embedded, and mobile target platforms. - \li \uicontrol {Qt Quick Controls Application} and + \li \uicontrol {Qt Quick Controls Application}, + \uicontrol {Qt Quick Controls 2 Application}, and \uicontrol {Qt Labs Controls Application} are like \uicontrol {Qt Quick Application}, but using + \l{http://doc-snapshots.qt.io/qt5-5.7/qtquickcontrols2-index.html} + {Qt Quick Controls 2} (requires Qt 5.7 or later), \l{http://doc.qt.io/qt-5/qtquickcontrols-index.html} - {Qt Quick Controls} or + {Qt Quick Controls}, or \l{http://doc.qt.io/qt-5/qtlabscontrols-index.html} - {Qt Labs Controls} + {Qt Labs Controls} (only for Qt 5.6) \li \uicontrol {Qt Canvas 3D Application} creates a Qt Quick application that imports the Qt Canvas 3D module and, optionally, includes |
