aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/doc/src/appdevguide
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2013-04-20 01:14:53 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-24 14:18:03 +0200
commitb1a321a1d7762e8c20e244164bd42822c3bd0310 (patch)
tree1da6ac38e696f099074683fb5858c999126c5884 /src/quick/doc/src/appdevguide
parent159ccaa57f6f653c36af47910b98e106be5112bc (diff)
Doc: Create links to Qt Quick 1
Point to the porting guide, so that users who search for the old names will be directed to an explanation of the name change. Also made some new links to Qt Quick 2, and changed "favour" -> "favor" (Sanity Bot complained) Change-Id: If30c8d619d8fdb9df72b7b5f3efd356f1e07b23a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/quick/doc/src/appdevguide')
-rw-r--r--src/quick/doc/src/appdevguide/porting.qdoc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/quick/doc/src/appdevguide/porting.qdoc b/src/quick/doc/src/appdevguide/porting.qdoc
index eac50a9606..fa7476fa89 100644
--- a/src/quick/doc/src/appdevguide/porting.qdoc
+++ b/src/quick/doc/src/appdevguide/porting.qdoc
@@ -77,7 +77,7 @@ into a \c QtQuick.LocalStorage singleton type. Any code that requires the local
\e {QtQuick.LocalStorage} instead. See the \l {QtQuick.LocalStorage 2}{QtQuick.LocalStorage} documentation
for examples.
\li The \c LayoutItem type has been removed from the \c QtQuick module as it was specific to the
-Graphics View framework backend used in \c {QtQuick 1}.
+Graphics View framework backend used in \l {Qt Quick 1}.
\endlist
\section2 Behavioral Changes
@@ -138,7 +138,7 @@ ShaderEffectItem type has been renamed to \l ShaderEffect.
In Qt 5, all QML applications are rendered with an OpenGL scenegraph architecture rather than the
Graphics View framework used in Qt 4. Due to the scale of this architectural change, the C++ API has
-been extensively restructured and the \c QtDeclarative module has been deprecated in favour of two
+been extensively restructured and the \c QtDeclarative module has been deprecated in favor of two
new modules: \l {Qt QML}, which implements the QML engine and language infrastructure, and \l {Qt Quick},
which implements the visual canvas and scenegraph backend.
@@ -192,7 +192,7 @@ Required header files can then be included:
\endcode
(The \c QtDeclarative module is still available to developers as the \c {Qt Quick 1} module, as
-discussed in \l{Using the QtDeclarative module in Qt 5}{below}. However, it should not be used for
+discussed \l {Qt Quick 1}{below}. However, it should not be used for
new applications.)
@@ -232,6 +232,8 @@ See the updated \l {qtqml-modules-cppplugins.html}{Creating C++ Plugins For QML}
an overview of creating QML plugins in Qt 5.
+\keyword Qt Quick 1
+
\section2 QtDeclarative module in Qt 5
For the purposes of porting older applications, the \c {QtDeclarative} module is still available in Qt