From 0c26483d0fd2a788f2c4afdaaac2416af84b0bcc Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 8 May 2015 15:42:05 +0200 Subject: [PATCH] Doc: Qt Quick 1.1 component was removed from wizard Change-Id: Ife7a77e7e04fff88cb7c0760be5e81e798553056 Reviewed-by: Daniel Teske --- .../projects/creator-projects-creating.qdoc | 2 +- doc/src/qtquick/qtquick-creating.qdoc | 23 ++++--------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index 3418bc1c790..fd960cb8f0f 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -107,7 +107,7 @@ \li Qt Quick Application Create a Qt Quick application that contains both QML and C++ - code. The project includes a QDeclarativeView or a QQuickView. + code. The project includes a QQuickView. You can build the application and deploy it to desktop and mobile target platforms. diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index 3b433ecaa5e..b665b4c5818 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -38,11 +38,10 @@ \list - \li \uicontrol {Qt Quick Application} creates a Qt Quick application project - that can contain both QML and C++ code. The project includes a - QDeclarativeView or QQuickView. You can build the application and - deploy it to - desktop and mobile target platforms. + \li \uicontrol {Qt Quick Application} creates a Qt Quick 2 application + project that can contain both QML and C++ code. The project includes + a QQuickView. You can build the application and deploy it to desktop + and mobile target platforms. \li \uicontrol {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 @@ -77,19 +76,7 @@ to use for the project. The Qt Quick imports enable you to use the basic QML types to create user interfaces, whereas the Qt Quick Controls provide a set of ready-made controls that you can customize - by using Qt Quick Controls Styles: - - \list - - \li Select \uicontrol {Qt Quick Controls} or \uicontrol {Qt Quick 2.1}, or - later, to develop for platforms that run Qt 5. - - \li Select \uicontrol {Qt Quick 1.1} to develop for platforms that run - Qt 4.7.4. To develop for platforms that run Qt 4.7.1, 4.7.2, or - 4.7.3, you must change the import statement to import Qt Quick - 1.0. - - \endlist + by using Qt Quick Controls Styles. You can add imports later to combine Qt Quick basic types with Qt Quick Controls, Qt Quick Dialogs, and Qt Quick Layouts (available since