diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2013-05-21 23:14:20 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-22 12:03:10 +0200 |
| commit | fbc3d5ed70f65ff4af4d961b2819dfc9601a47af (patch) | |
| tree | 5824c710f510bebeb3baeaa54d2bc41995fd11b4 | |
| parent | e314cc0f609270796dcf840f0417bd751dead21b (diff) | |
| download | qtdoc-fbc3d5ed70f65ff4af4d961b2819dfc9601a47af.tar.gz | |
Doc: Revert QtQuick1 -> QtDeclarative
The library name, header include paths, etc. were reverted back in
October 2012: https://codereview.qt-project.org/#change,35516
Change-Id: I9056e9338dfc547cb0a52b49998e5e3a98202d81
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| -rw-r--r-- | doc/src/deployment/deployment.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/qmlapp/porting.qdoc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc index e2d660c2..f4fa0133 100644 --- a/doc/src/deployment/deployment.qdoc +++ b/doc/src/deployment/deployment.qdoc @@ -99,7 +99,7 @@ \li \l{Qt Graphical Effects}{QtGraphicalEffects} \row \li \l{Qt Script}{QtScript} - \li QtQuick1 (formerly QtDeclarative) + \li \l{Qt Quick 1}{QtDeclarative} \li \l{Qt Image Formats}{QtImageFormats} \endtable diff --git a/doc/src/qmlapp/porting.qdoc b/doc/src/qmlapp/porting.qdoc index d0e32884..a973696c 100644 --- a/doc/src/qmlapp/porting.qdoc +++ b/doc/src/qmlapp/porting.qdoc @@ -241,17 +241,17 @@ For the purposes of porting older applications, the \c {QtDeclarative} module is QDeclarativeView or QDeclarativeItem and the Graphics View integration) can use this module. Note that new applications should use the new \l {Qt QML} and \l {Qt Quick} modules instead. -To use the \c {Qt Quick 1} module, add "quick1" to your qmake \c .pro file: +To use the \c {Qt Quick 1} module, add "declarative" to your qmake \c .pro file: \code -QT += quick1 +QT += declarative \endcode -Required header files can be included from the Qt Quick 1 module: +Required header files can be included as follows: \code -#include <QtQuick1/QDeclarativeView> -#include <QtQuick1/QDeclarativeItem> +#include <QtDeclarative/QDeclarativeView> +#include <QtDeclarative/QDeclarativeItem> \endcode */ |