Doc: changes to the Qt Quick project wizards

Update all screen shots.

Change-Id: I3250dba678bc641fdaf767cbabf7f471e63bab3a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

12 files changed, 30 insertions, 60 deletions

diff --git a/doc/images/qmldesigner-import-project.png b/doc/images/qmldesigner-import-project.png
index 1b0ac3d167..7856d70f77 100644
--- a/doc/images/qmldesigner-import-project.png
+++ b/doc/images/qmldesigner-import-project.png
diff --git a/doc/images/qmldesigner-new-app-project-mobile-options.png b/doc/images/qmldesigner-new-app-project-mobile-options.png
index 5fde958ee6..98cd1853e4 100644
--- a/doc/images/qmldesigner-new-app-project-mobile-options.png
+++ b/doc/images/qmldesigner-new-app-project-mobile-options.png
diff --git a/doc/images/qmldesigner-new-project-harmattan-options.png b/doc/images/qmldesigner-new-project-harmattan-options.png
new file mode 100644
index 0000000000..be0238480c
--- /dev/null
+++ b/doc/images/qmldesigner-new-project-harmattan-options.png
diff --git a/doc/images/qmldesigner-new-project-location.png b/doc/images/qmldesigner-new-project-location.png
index b58aedeb88..dd3f9bc161 100644
--- a/doc/images/qmldesigner-new-project-location.png
+++ b/doc/images/qmldesigner-new-project-location.png
diff --git a/doc/images/qmldesigner-new-project-qt-versions.png b/doc/images/qmldesigner-new-project-qt-versions.png
index 95f47324ca..8937e95926 100644
--- a/doc/images/qmldesigner-new-project-qt-versions.png
+++ b/doc/images/qmldesigner-new-project-qt-versions.png
diff --git a/doc/images/qmldesigner-new-project-summary.png b/doc/images/qmldesigner-new-project-summary.png
index b86a5999b5..bf0e2ebc8b 100644
--- a/doc/images/qmldesigner-new-project-summary.png
+++ b/doc/images/qmldesigner-new-project-summary.png
diff --git a/doc/images/qmldesigner-new-project-symbian-options.png b/doc/images/qmldesigner-new-project-symbian-options.png
index 4037aaeebc..ad10ff5640 100644
--- a/doc/images/qmldesigner-new-project-symbian-options.png
+++ b/doc/images/qmldesigner-new-project-symbian-options.png
diff --git a/doc/images/qmldesigner-new-project.png b/doc/images/qmldesigner-new-project.png
index 685fb1d65a..ac8e4e1505 100644
--- a/doc/images/qmldesigner-new-project.png
+++ b/doc/images/qmldesigner-new-project.png
diff --git a/doc/images/qmldesigner-new-ui-project-location.png b/doc/images/qmldesigner-new-ui-project-location.png
index a65d85cd07..4439abf87d 100644
--- a/doc/images/qmldesigner-new-ui-project-location.png
+++ b/doc/images/qmldesigner-new-ui-project-location.png
diff --git a/doc/images/qmldesigner-new-ui-project-summary.png b/doc/images/qmldesigner-new-ui-project-summary.png
index 81071d7b73..299b2adf34 100644
--- a/doc/images/qmldesigner-new-ui-project-summary.png
+++ b/doc/images/qmldesigner-new-ui-project-summary.png
diff --git a/doc/images/qtcreator-new-qt-quick-project-wizard.png b/doc/images/qtcreator-new-qt-quick-project-wizard.png
index 0287d8c6fb..9c318c9390 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/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc
index 8629acb046..1846108d3f 100644
--- a/doc/src/qtquick/qtquick-creating.qdoc
+++ b/doc/src/qtquick/qtquick-creating.qdoc
@@ -44,9 +44,13 @@
         \o  \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 on
-            desktop and mobile target platforms. For example, you
-            can create signed Symbian Installation System (SIS) packages for
-            this type of projects.
+            desktop and mobile target platforms.
+
+            You can select a template that uses either the built-in QML elements
+            or Qt Quick components for a particular platform. The built-in QML
+            elements 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.
 
         \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
@@ -54,16 +58,18 @@
             need to have the development environment installed on your
             computer to create and run this type of projects.
 
-        \o  \gui {Custom QML Extension Plugin} creates a C++ plugin that makes
+        \o  \gui {Qt Quick Application (from Existing QML File)} converts
+            existing QML applications to Qt Quick application projects. This
+            enables you to run them from \QC and to deploy them to mobile
+            devices.
+
+        \o  \gui {Custom QML Extension Plugin} (in the \gui Libraries category)
+            creates a C++ plugin that makes
             it possible to offer extensions that can be loaded dynamically into
             applications by using the QDeclarativeEngine class.
 
     \endlist
 
-    If you have existing QML applications that you want to run in \QC or deploy
-    to mobile devices, use the \gui {Qt Quick Application} wizard to convert
-    them to Qt Quick applications.
-
     \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
@@ -78,7 +84,7 @@
 
     \list 1
 
-        \o  Select \gui {File > New File or Project > Qt Quick Project >
+        \o  Select \gui {File > New File or Project > Applications >
             Qt Quick UI > Choose}.
 
             The \gui{Introduction and Project Location} dialog opens.
@@ -128,8 +134,14 @@
 
     \list 1
 
-        \o  Select \gui {File > New File or Project > Qt Quick Project >
-            Qt Quick Application > Choose}.
+        \o  Select \gui {File > New File or Project > Applications >
+            Qt Quick Application (Built-in Elements) > Choose}.
+
+            \note We recommend that you use the \gui {Qt Quick Application for
+            MeeGo Harmattan} template when you develop for MeeGo Harmattan
+            devices and the \gui {Qt Quick Application for Symbian} template
+            when you develop for Symbian devices that support Qt 4.7.4, or
+            later.
 
             The \gui{Introduction and Project Location} dialog opens.
 
@@ -146,23 +158,6 @@
 
         \o  Click \gui{Next}.
 
-            The \gui {Application Type} dialog opens.
-
-            \image qmldesigner-new-project-qml-sources.png "Application Type dialog"
-
-        \o  Select the Qt Quick Component Set to use in your application. The
-            built-in elements allow you to write cross-platform applications
-            with custom look and feel. The components for a mobile platform
-            allow you to create applications with a native look and feel for
-            that platform.
-
-            \note We recommend that you use \gui {Qt Quick Components for
-            MeeGo Harmattan} when you develop for MeeGo Harmattan devices.
-
-            You can also import an existing QML file in this dialog.
-
-        \o  Click \gui{Next}.
-
             The \gui {Target Setup} dialog opens.
 
             \image qmldesigner-new-project-qt-versions.png "Target Setup dialog"
@@ -203,9 +198,9 @@
 
         \o  Click \gui Next.
 
-            The \gui {Maemo Specific} dialog opens.
+            The \gui {Harmattan Specific} dialog opens.
 
-            \image qmldesigner-new-project-maemo-options.png "Maemo Specific dialog"
+            \image qmldesigner-new-project-harmattan-options.png "Harmattan Specific dialog"
 
         \o  In the \gui {Application icon} field, select the application
             icon to use on Maemo or Harmattan targets, or use the default icon.
@@ -230,38 +225,13 @@
     \section1 Importing QML Applications
 
     If you have existing QML applications that you want to run in \QC or deploy
-    to mobile devices, use the \gui {Qt Quick Application} wizard and select the
-    main .qml file in your project. All the other files in the project are
-    automatically added to the application project.
-
-    To import QML applications:
-
-    \list 1
-
-        \o  Select \gui {File > New File or Project > Qt Quick Project >
-            Qt Quick Application > Choose}.
-
-        \o  Name the project and set its path, and then click \gui Next.
-
-        \o  In the \gui {Application Type} dialog, select the \gui {Use an
-            existing .qml file} option and specify the main .qml file of the
-            project you want to import.
-
-            \image qmldesigner-import-project.png "Application Type dialog"
-
-        \o  Click \gui Next.
+    to mobile devices, select the \gui {Qt Quick Application (from Existing QML
+    File)} template to import the main .qml file in your project.
 
-        \o  Select the Qt versions to use as build targets for your project,
-            and click \gui{Next}.
-
-        \o  Specify options for deploying the application to mobile device
-            targets, and click \gui{Next}.
-
-        \o  Review the project settings, and click \gui{Finish} to create the
-            project.
-
-    \endlist
+    \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.