diff --git a/doc/images/qmldesigner-import-project.png b/doc/images/qmldesigner-import-project.png
index 1b0ac3d1676d1922cf091261b2fe46686358a284..7856d70f772c1f6a064b53ff78b88599184760b9 100644
Binary files a/doc/images/qmldesigner-import-project.png and b/doc/images/qmldesigner-import-project.png differ
diff --git a/doc/images/qmldesigner-new-app-project-mobile-options.png b/doc/images/qmldesigner-new-app-project-mobile-options.png
index 5fde958ee648dbc342196fc195b6d7a4c82a19c4..98cd1853e4715d34aa6626b9fa4f5725f5c36596 100644
Binary files a/doc/images/qmldesigner-new-app-project-mobile-options.png and b/doc/images/qmldesigner-new-app-project-mobile-options.png differ
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 0000000000000000000000000000000000000000..be0238480ce5b43bca293999ec4b1fef6d87b949
Binary files /dev/null and b/doc/images/qmldesigner-new-project-harmattan-options.png differ
diff --git a/doc/images/qmldesigner-new-project-location.png b/doc/images/qmldesigner-new-project-location.png
index b58aedeb881702af2a10667d4a1094c997880d76..dd3f9bc1611bd1272f0837530fbbf665d5b27f08 100644
Binary files a/doc/images/qmldesigner-new-project-location.png and b/doc/images/qmldesigner-new-project-location.png differ
diff --git a/doc/images/qmldesigner-new-project-qt-versions.png b/doc/images/qmldesigner-new-project-qt-versions.png
index 95f47324caaa23c20e2fdfcc382d0462f16ecad8..8937e959263aa394c05225d72defeb302ac8f3c2 100644
Binary files a/doc/images/qmldesigner-new-project-qt-versions.png and b/doc/images/qmldesigner-new-project-qt-versions.png differ
diff --git a/doc/images/qmldesigner-new-project-summary.png b/doc/images/qmldesigner-new-project-summary.png
index b86a5999b52741bdadbd01e522bbc941587cd57b..bf0e2ebc8b42808fbe3b98d8891bb5a80d34ed9a 100644
Binary files a/doc/images/qmldesigner-new-project-summary.png and b/doc/images/qmldesigner-new-project-summary.png differ
diff --git a/doc/images/qmldesigner-new-project-symbian-options.png b/doc/images/qmldesigner-new-project-symbian-options.png
index 4037aaeebc7139038c47c53f0e2360664f882209..ad10ff564097faabe1521f9185b7b7285d746503 100644
Binary files a/doc/images/qmldesigner-new-project-symbian-options.png and b/doc/images/qmldesigner-new-project-symbian-options.png differ
diff --git a/doc/images/qmldesigner-new-project.png b/doc/images/qmldesigner-new-project.png
index 685fb1d65aa76612147938b6143e8cdcb81db7ef..ac8e4e15058ddb44b93fda989b98db4e5ebcb937 100644
Binary files a/doc/images/qmldesigner-new-project.png and b/doc/images/qmldesigner-new-project.png differ
diff --git a/doc/images/qmldesigner-new-ui-project-location.png b/doc/images/qmldesigner-new-ui-project-location.png
index a65d85cd07b36a2d9527920172ca50136261250a..4439abf87d3f96dbde678499553f7e83050fe19d 100644
Binary files a/doc/images/qmldesigner-new-ui-project-location.png and b/doc/images/qmldesigner-new-ui-project-location.png differ
diff --git a/doc/images/qmldesigner-new-ui-project-summary.png b/doc/images/qmldesigner-new-ui-project-summary.png
index 81071d7b7389cc2073155c9c8701aaa7f63d6686..299b2adf34a4872038d0810ce42dd4ff15f5602a 100644
Binary files a/doc/images/qmldesigner-new-ui-project-summary.png and b/doc/images/qmldesigner-new-ui-project-summary.png differ
diff --git a/doc/images/qtcreator-new-qt-quick-project-wizard.png b/doc/images/qtcreator-new-qt-quick-project-wizard.png
index 0287d8c6fb3dc30df8dcf2a63e574285ea69cdce..9c318c9390019883b1c6cf74d1acb74ab3a5485d 100644
Binary files a/doc/images/qtcreator-new-qt-quick-project-wizard.png and b/doc/images/qtcreator-new-qt-quick-project-wizard.png differ
diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc
index 8629acb046a39d555c119303827e3e9c240d58e5..1846108d3fdee4cca13fcbd2787d82721af04024 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.
@@ -144,23 +156,6 @@
For example, \c {C:\Qt\examples}. To select the path from a
directory tree, click \gui Browse.
- \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.
@@ -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.