diff options
| author | Leena Miettinen <riitta-leena.miettinen@digia.com> | 2012-11-26 11:50:39 +0100 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@digia.com> | 2012-11-26 11:56:27 +0100 |
| commit | 204902f5fdd19c19da4b7bdd2b3ef6560b5f6ca8 (patch) | |
| tree | c88fc748aa35ea2c6aa62c1c39c01ca26f824d53 /doc | |
| parent | 209585d8f8cb878c6bd4ac4d8e01194d44ef9cea (diff) | |
| download | qt-creator-204902f5fdd19c19da4b7bdd2b3ef6560b5f6ca8.tar.gz | |
Doc: separate extension plugins for Qt Quick 1 and 2
Task-number: QTCREATORBUG-8269
Change-Id: I83dbfa1eb12405c6d9e4609669ecef165b348cf2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/projects/creator-projects-creating.qdoc | 20 | ||||
| -rw-r--r-- | doc/src/qtquick/qtquick-creating.qdoc | 16 |
2 files changed, 22 insertions, 14 deletions
diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index 21b9bd5e60..bbaf9696b7 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -120,15 +120,15 @@ custom look and feel and QML and C++ code to implement the application logic - \o Qt Quick Application for MeeGo Harmattan + \o Qt Quick 1 Application for MeeGo Harmattan Use Qt Quick Components for MeeGo Harmattan to design a user interface with the platform look and feel - \o Qt Quick Application (from Existing QML File) + \o Qt Quick 1 Application (from Existing QML File) - Convert existing QML applications to projects that you can run - in \QC or deploy to mobile devices + Convert existing Qt Quick 1 applications to projects that you + can run in \QC or deploy to mobile devices \o Qt Console Application @@ -158,12 +158,18 @@ Shared or static C++ library based on qmake - \o Custom QML Extension Plugin + \o Qt Quick 1 Extension Plugin - C++ plugin that makes it possible to offer extensions - that can be loaded dynamically into applications by using the + C++ plugin that makes it possible to offer extensions that can + be loaded dynamically into Qt Quick 1 applications by using the QDeclarativeEngine class + \o Qt Quick 2 Extension Plugin + + C++ plugin that makes it possible to offer extensions that can + be loaded dynamically into Qt Quick 2 applications by using the + QQmlEngine class + \o \QC Plugin diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index 623b84961c..a3a8e63890 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -64,15 +64,17 @@ need to have the development environment installed on your computer to create and run this type of projects. - \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 + \o \gui {Qt Quick 1 Application (from Existing QML File)} converts + existing Qt Quick 1 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. + \o \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 + \gui {Qt Quick 1 Extension Plugin} to create extensions for + Qt Quick 1 applications and \gui {Qt Quick 2 Extension Plugin} to + create extensions for Qt Quick 2 applications. \endlist |