Doc: changes in Qt Quick project wizards

The Qt Quick application wizards were combined into
one wizard and the wizard for importing existing QML
projects was removed.

Change-Id: I2761c0065541a54bb3efe970ed9481352adc9fec
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

doc/src/android/androiddev.qdoc

@@ -106,8 +106,7 @@
 
         \li To create an application, select \gui File >
             \gui {New File or Project} > \gui Applications >
-            \gui {Qt Quick Application 1 (Built-in Elements)} or
+            \gui {Qt Quick Application} > \gui Choose, and
-            \gui {Qt Quick Application 2 (Built-in Elements)} > \gui Choose, and
             follow the instructions of the wizard. For more information, see
             \l{Creating Qt Quick Projects}.
 
@@ -149,7 +148,7 @@
             warning if it cannot find a suitable Qt version.
 
         \li Select \gui File > \gui {New File or Project} > \gui Applications >
-            \gui {Qt Quick Application 2 (Built-in Elements)} > \gui Choose, and
+            \gui {Qt Quick Application} > \gui Choose, and
             follow the instructions of the wizard. For more information, see
             \l{Creating Qt Quick Projects}.
 

doc/src/android/creator-android-app-tutorial.qdoc

@@ -44,7 +44,7 @@
     \list 1
 
         \li Select \gui File > \gui {New File or Project} > \gui Applications >
-            \gui {Qt Quick 2 Application (Qt Quick Controls)} > \gui Choose.
+            \gui {Qt Quick Application} > \gui Choose.
 
         \li In the \gui{Name} field, type \b{accelbubble}.
 
@@ -52,6 +52,9 @@
             For example, \c {C:\Qt\examples}, and then click \gui{Next} (or
             \gui Continue on Mac OS X).
 
+        \li In the \gui {Qt Quick component set} field, select
+            \gui {Qt Quick Controls 1.0}.
+
         \li Select an Android \l{glossary-buildandrun-kit}{kit} for ARM,
             and click \gui{Next}.
 

doc/src/overview/creator-design-overview.qdoc

@@ -39,8 +39,8 @@
 
         \li \l{Developing Qt Quick Applications}
 
-            You can either create Qt Quick projects from scratch or import
+            You can use wizards to create Qt Quick projects that contain
-            existing projects to \QC. You can use the code editor (Edit mode)
+            boiler-plate code. You can use the code editor (Edit mode)
             or the visual editor (Design mode) to develop Qt Quick applications.
         \li \l{Developing Widget Based Applications}
 

doc/src/projects/creator-projects-creating.qdoc

@@ -103,24 +103,12 @@
                 Use \QD forms to design a Qt widget based user interface for the
                 desktop and C++ to implement the application logic
 
-            \li Mobile Qt Application
+            \li Qt Quick Application
 
-                Use \QD forms to design a Qt widget based user interface for
+                Create a Qt Quick application that contains both QML and C++
-                mobile devices and C++ to implement the application logic.
+                code. The project includes a QDeclarativeView or a QQuickView.
-                Select this template to develop for devices that support only
+                You can build the application and deploy it to desktop and
-                Qt 4.6.x
+                mobile target platforms.
-
-            \li Qt Quick Application (Built-in Types)
-
-                Use built-in QML types 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
-
-            \li Qt Quick Application (from Existing QML File)
-
-                Convert existing Qt Quick applications to projects that you
-                can run in \QC or deploy to mobile devices
 
             \li Qt Console Application
 

doc/src/qtquick/qtquick-app-development.qdoc

@@ -35,8 +35,7 @@
 
         \li \l {Creating Qt Quick Projects}
 
-            You can either create Qt Quick projects from scratch or import
+            You can use wizards to create Qt Quick projects.
-            existing projects to \QC.
         \li \l {Using Qt Quick Designer}
 
             You can use the code editor (Edit mode) or the visual editor (Design

doc/src/qtquick/qtquick-app-tutorial.qdoc

@@ -48,11 +48,7 @@
     \list 1
 
         \li Select \gui{File > New File or Project > Applications >
-            Qt Quick 2 Application (Built-in Types) > Choose}.
+            Qt Quick Application > Choose}.
-
-            \note The QML types used in this example are also supported in Qt Quick 1. To create
-            this example application for platforms that run Qt 4, select \gui {Qt Quick 1
-            Application (Built-in Types)}.
 
         \li In the \gui{Name} field, type \b {Transitions}.
 
@@ -60,6 +56,13 @@
             For example, \c {C:\Qt\examples}, and then click \gui{Next} (on
             Windows and Linux) or \gui Continue (on Mac OS).
 
+        \li In the \gui {Qt Quick component set} field, select
+            \gui {Qt Quick 2.0}.
+
+            \note The QML types used in this example are also supported in
+            Qt Quick 1.1. To create this example application for platforms that
+            run Qt 4, select \gui {Qt Quick 1.1}.
+
         \li Select \l{glossary-buildandrun-kit}{kits} for running and building your project,
             and then click \gui{Next}.
 

doc/src/qtquick/qtquick-creating.qdoc

@@ -40,23 +40,10 @@
 
         \li \gui {Qt Quick Application} creates a Qt Quick application project
             that can contain both QML and C++ code. The project includes a
-            QDeclarativeView. You can build the application and deploy it to
+            QDeclarativeView or QQuickView. You can build the application and
+            deploy it to
             desktop and mobile target platforms.
 
-            You can select a template that uses either the built-in QML types
-            or Qt Quick components for a particular platform. The built-in QML
-            types enable you to create cross-platform applications with a
-            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. To develop for platforms that run
-            Qt 4.7.3, 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.
         \li \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 a \l{Previewing QML Files}{preview tool} and you need
@@ -68,11 +55,6 @@
             This project requires that you have installed the Qt Quick Controls
             for your Qt version (5.1 or later).
 
-        \li \gui {Qt Quick Application (from Existing QML File)} converts
-            existing Qt Quick applications to Qt Quick application projects.
-            This enables you to run them from \QC and to deploy them to mobile
-            devices.
-
         \li \gui {Qt Quick Extension Plugins} (in the \gui Libraries category)
             create C++ plugins that make it possible to offer extensions that
             can be loaded dynamically into Qt Quick applications. Select
@@ -111,9 +93,39 @@
 
     \section1 Creating Qt Quick Applications
 
-    Select \gui File > \gui {New File or Project} > \gui Applications >
+    \list 1
-    \gui {Qt Quick Application 1 (Built-in Types)} or \gui {Qt Quick Application 2 (Built-in Types)}
+
-    > \gui Choose, and follow the instructions of the wizard.
+        \li Select \gui File > \gui {New File or Project} > \gui Applications >
+            \gui {Qt Quick Application} > \gui Choose.
+
+        \li In the \gui {Qt Quick component set} field, select the component set
+            to use for the project. The Qt Quick imports enable you to create
+            cross-platform applications with a custom look and feel, whereas the
+            Qt Quick Controls provide the look and feel for a particular
+            platform:
+
+        \list 1
+
+            \li Select \gui {Qt Quick Controls 1.0} or \gui {Qt Quick 2.0} to
+                develop for platforms that run Qt 5.
+
+            \li Select \gui {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
+
+        \li Select \l{glossary-buildandrun-kit}{kits} for running and building
+            your project, and then click \gui{Next}.
+
+            \note Kits are listed if they have been specified in \gui Tools >
+            \gui Options > \gui {Build & Run} > \gui Kits.
+
+        \li Review the project settings, and click \gui{Finish} (on Windows and
+            Linux) or \gui Done (on Mac OS) to create the project.
+
+    \endlist
 
     \note The SDK for a particular target platform might install additional
     templates for that platform. For example, the BlackBerry 10 and QNX templates are installed
@@ -122,18 +134,4 @@
     \QC creates the necessary boilerplate files. Some of the files are
     specific to a particular target platform.
 
-    \section1 Importing QML Applications
-
-    If you have existing QML applications that you want to run in \QC or deploy
-    to mobile devices, select \gui File > \gui {New File or Project} > \gui Applications >
-    \gui {Qt Quick 1 Application (from Existing QML file} or \gui {Qt Quick 2 Application
-    (from Existing QML File)} > \gui Choose to import the main .qml file in your project.
-
-    \image qmldesigner-import-project.png "Select Existing QML File dialog"
-
-    All the other files in the project are automatically added to the
-    application project.
-    \QC adds references to the QML files to a project and creates the additional
-    files necessary for deploying applications to mobile devices.
-
 */