Doc: switch fixed links from Qt 4.8 to 5.0

Will look into changing automatically created links in
another patch.

Change-Id: I29b61c5301402c40d9e711762a6b57479088152b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
This commit is contained in:
Leena Miettinen
2013-03-13 10:29:46 +01:00
parent 5ee3a90c15
commit e3587e8f0d
22 changed files with 82 additions and 82 deletions

View File

@@ -89,11 +89,11 @@
A user interface is only a part of an application, and not really useful by itself.
You can use Qt or JavaScript to implement the application logic. For more information on
using JavaScript, see
\l {http://qt-project.org/doc/qt-4.8/qdeclarativejavascript.html}
{Integrating JavaScript}.
\l{http://qt-project.org/doc/qt-5.0/qtqml/qtqml-javascript-topic.html}
{Integrating QML and JavaScript}.
For an example of how to use JavaScript to develop a game, see the
\l {http://qt-project.org/doc/qt-4.8/qml-advtutorial.html}
\l{http://qt-project.org/doc/qt-5.0/qtquick/qtquick2-qml-advtutorial.html}
{QML Advanced Tutorial}.
*/

View File

@@ -91,7 +91,7 @@
\endlist
To create a graphical button that scales beautifully without using vector
graphics, use the \l{http://qt-project.org/doc/qt-4.8/qml-borderimage.html}
graphics, use the \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-borderimage.html}
{Border Image} element. For more information, see
\l{Creating Scalable Buttons and Borders}.
@@ -107,7 +107,8 @@
\title Creating Scalable Buttons and Borders
You can use the \l{http://qt-project.org/doc/qt-4.8/qml-borderimage.html}
You can use the
\l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-borderimage.html}
{Border Image} element to display an image, such as a PNG file, as a border
and a background.

View File

@@ -41,34 +41,34 @@
\list
\li \l{http://qt-project.org/doc/qt-4.8/qml-borderimage.html}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-borderimage.html}
{Border Image}
uses an image as a border or background.
\li \l{http://qt-project.org/doc/qt-4.8/qml-image.html}{Image}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-image.html}{Image}
adds a bitmap to the scene. You can stretch and tile images.
\li \l{http://qt-project.org/doc/qt-4.8/qml-item.html}{Item}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-item.html}{Item}
is the most basic of all visual items in QML. Even though it has no
visual appearance, it defines all the properties that are common
across visual items, such as the x and y position, width and height,
anchoring, and key handling.
\li \l{http://qt-project.org/doc/qt-4.8/qml-rectangle.html}{Rectangle}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-rectangle.html}{Rectangle}
adds a rectangle that is painted with a solid fill color and an
optional border. You can also use the radius property to create
rounded rectangles.
\li \l{http://qt-project.org/doc/qt-4.8/qml-text.html}{Text}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-text.html}{Text}
adds formatted read-only text.
\li \l{http://qt-project.org/doc/qt-4.8/qml-textedit.html}{Text Edit}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-textedit.html}{Text Edit}
adds a single line of editable formatted text that can be validated.
\li \l{http://qt-project.org/doc/qt-4.8/qml-textinput.html}{Text Input}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-textinput.html}{Text Input}
adds a single line of editable plain text that can be validated.
\li \l{http://qt-project.org/doc/qt-4.8/qml-webview.html}{Web View}
\li \l{http://qt-project.org/doc/qt-5.0/qtwebkit/qml-qtwebkit3-webview.html}{Web View}
adds web content to a canvas.
\endlist

View File

@@ -96,10 +96,9 @@
\endlist
The \c import statement in the beginning of the .qml file specifies the
\l{http://qt-project.org/doc/qt-4.8/qdeclarativemodules.html}{Qt modules} to
import. Each Qt module contains a set of default elements. Specify a version
to get the features you want.
The \c import statement in the beginning of the .qml file specifies the Qt modules to
\l{http://qt-project.org/doc/qt-5.0/qtqml/qtqml-syntax-imports.html}{import}. Each Qt module
contains a set of default elements. Specify a version to get the features you want.
To use JavaScript and image files in the application, copy them to the
project folder.

View File

@@ -76,8 +76,8 @@
\section1 Managing Element Hierarchy
The \gui Navigator pane displays the
\l{http://qt-project.org/doc/qt-4.8/qdeclarativeelements.html}{QML elements}
in the current QML file and their relationships. Elements (1) are listed in a
\l{http://qt-project.org/doc/qt-5.0/qtquick/qtquick-qmltypereference.html}{Qt Quick QML types}
in the current QML file and their relationships. QML types (1) are listed in a
tree structure, below their parent (2).
\image qmldesigner-navigator.png "Navigator pane"
@@ -118,10 +118,10 @@
\section2 Setting the Stacking Order
The \l{http://qt-project.org/doc/qt-4.8/qml-item.html#z-prop}{z property} of an
element determines its position in relation to its sibling elements in the
element hierarchy. By default, elements with a higher stacking value are
drawn on top of siblings with a lower stacking value. Elements with the same
The \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-item.html#z-prop}{z property} of a
QML type determines its position in relation to its sibling types in the
type hierarchy. By default, types with a higher stacking value are
drawn on top of siblings with a lower stacking value. Types with the same
stacking value are drawn in the order they are listed, from the last item
up.
@@ -245,7 +245,8 @@
\section2 Setting Expressions
\l{http://qt-project.org/doc/qt-4.8/propertybinding.html}{Property binding} is a
\l{http://qt-project.org/doc/qt-5.0/qtqml/qtqml-syntax-propertybinding.html}
{Property binding} is a
declarative way of specifying the value of a property.
Binding allows a property value to be expressed as an JavaScript expression
that defines the value relative to other property values or data accessible
@@ -262,8 +263,8 @@
To remove expressions, select \gui Reset in the context menu.
For more information on the JavaScript environment provided by QML, see
\l{http://qt-project.org/doc/qt-4.8/qdeclarativejavascript.html}
{Integrating JavaScript}.
\l{http://qt-project.org/doc/qt-5.0/qtqml/qtqml-javascript-topic.html}
{Integrating QML and JavaScript}.
\section2 Marking Text Elements for Translation
@@ -365,9 +366,9 @@
\section2 Setting Anchors and Margins
In addition to arranging elements in a grid, row, or column, you can use
\l{http://qt-project.org/doc/qt-4.8/qml-anchor-layout.html}{anchors} to lay out
screens. In an anchor-based layout, each item can be thought of as having a
In addition to arranging QML types in a grid, row, or column, you can use
\l{http://qt-project.org/doc/qt-5.0/qtquick/qtquick-positioning-anchors.html}{anchors}
to lay out screens. In an anchor-based layout, each QML type can be thought of as having a
set of invisible \e anchor lines: top, bottom, left, right, fill, horizontal
center, vertical center, and baseline.
@@ -423,8 +424,8 @@
transformations to an item. Each transformation is applied in order, one at
a time.
For more information on Transform elements, see
\l {http://qt-project.org/doc/qt-4.8/qml-transform.html}{QML Transform Element}.
For more information on Transform types, see
\l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-transform.html}{Transform}.
\section1 Adding States
@@ -463,7 +464,7 @@
\endlist
The \gui State pane displays the different
\l{http://qt-project.org/doc/qt-4.8/qdeclarativestates.html}{states}
\l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-state.html}{states}
of the component in the Qt Quick Designer.
\image qmldesigner-transitions.png "State pane"

View File

@@ -37,9 +37,9 @@
When you write a QML module or use QML from a C++ application you typically
register new types with
\l{http://qt-project.org/doc/qt-4.8/qdeclarativeengine.html#qmlRegisterType}
\l{http://qt-project.org/doc/qt-5.0/qtqml/qqmlengine.html#qmlRegisterType}
{qmlRegisterType} or expose some class instances with
\l{http://qt-project.org/doc/qt-4.8/qdeclarativecontext.html#setContextProperty}
\l{http://qt-project.org/doc/qt-5.0/qtqml/qqmlcontext.html#setContextProperty}
{setContextProperty}. The \QC C++ code model now scans for these calls and
tells the QML code model about them. This means that properties are
displayed during code completion and the JavaScript code checker does not
@@ -55,8 +55,8 @@
For Qt 4.8 and later, one or more \c qmltypes files can be listed in the
\c qmldir file under the \c typeinfo header. These files will be read in
addition to \c{plugins.qmltypes}. For more information, see
\l{http://qt-project.org/doc/qt-4.8/qdeclarativemodules.html#writing-a-qmldir-file}
{Writing a qmldir File}.
\l{http://qt-project.org/doc/qt-5.0/qtqml/qtqml-modules-qmldir.html#writing-a-qmltypes-file}
{Writing a qmltypes File}.
\section1 Generating qmltypes Files

View File

@@ -63,23 +63,23 @@
\section1 Using Data Models
You can create the following types of views to organize items provided by
\l{http://qt-project.org/doc/qt-4.8/qdeclarativemodels.html}{data models}:
\l{http://qt-project.org/doc/qt-5.0/qtquick/qtquick-modelviewsdata-modelview.html}{data models}:
\list
\li \l{http://qt-project.org/doc/qt-4.8/qml-gridview.html}{Grid View}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-gridview.html}{Grid View}
provides a grid vizualization of a model.
\li \l{http://qt-project.org/doc/qt-4.8/qml-listview.html}{List View}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-listview.html}{List View}
provides a list vizualization of a model.
\li \l{http://qt-project.org/doc/qt-4.8/qml-pathview.html}{Path View}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-pathview.html}{Path View}
visualizes the contents of a model along a path.
\endlist
When you add a Grid View, List View, or Path View element, the
\l{http://qt-project.org/doc/qt-4.8/qml-listmodel.html}{ListModel} and the
\l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-listmodel.html}{ListModel} and the
delegate component that creates an instance for each item in the model are
added automatically. You can edit element properties
\if defined(qcmanual)
@@ -94,17 +94,17 @@
\list
\li \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-column.html}{Column}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-column.html}{Column}
arranges its child items vertically.
\li \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-row.html}{Row}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-row.html}{Row}
arranges its child items horizontally.
\li \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-grid.html}{Grid}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-grid.html}{Grid}
arranges its child items so that they are aligned in a grid and
are not overlapping.
\li \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-flow.html}{Flow}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-flow.html}{Flow}
arranges its child items side by side, wrapping as necessary.
\endlist
@@ -210,16 +210,16 @@
use different types of animated transitions. For example, you can animate
changes to property values and colors. You can use rotation animation to
control the direction of rotation. For more information, see
\l{http://qt-project.org/doc/qt-4.8/qdeclarativeanimation.html}
{QML Animation}.
\l{http://qt-project.org/doc/qt-5.0/qtquick/qtquick-statesanimations-animations.html}
{Animation and Transitions in Qt Quick}.
You can use the \c ParallelAnimation element to start several animations at
the same time. Or use the \c SequentialAnimation element to run them one
after another.
You can use the code editor to specify transitions. For more information,
see \l{http://qt-project.org/doc/qt-4.8/qml-transition.html}
{QML Transition Element}.
see \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-transition.html}
{Transition}.
*/
@@ -237,18 +237,18 @@
\list
\li \l{http://qt-project.org/doc/qt-4.8/qml-flickable.html}{Flickable}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-flickable.html}{Flickable}
items can be flicked horizontally or vertically.
\li \l{http://qt-project.org/doc/qt-4.8/qml-flipable.html}{Flipable}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-flipable.html}{Flipable}
items can be flipped between their front and back sides by using
rotation, state, and transition.
\li \l{http://qt-project.org/doc/qt-4.8/qml-focusscope.html}{Focus Scope}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-focusscope.html}{Focus Scope}
assists in keyboard focus handling when building reusable QML
components.
\li \l{http://qt-project.org/doc/qt-4.8/qml-mousearea.html}{Mouse Area}
\li \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-mousearea.html}{Mouse Area}
enables simple mouse handling.
\endlist

View File

@@ -48,8 +48,8 @@
\section1 Previewing Images
The Qt Quick Toolbar for images allows you to edit the properties of
\l{http://qt-project.org/doc/qt-4.8/qml-borderimage.html}{Border Image}
and \l{http://qt-project.org/doc/qt-4.8/qml-image.html}{Image} components.
\l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-borderimage.html}{Border Image}
and \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-image.html}{Image} components.
You can scale and tile the images, replace them with other images,
preview them, and change the image margins.
@@ -63,7 +63,7 @@
\section1 Formatting Text
The Qt Quick Toolbar for text allows you to edit the properties of
\l{http://qt-project.org/doc/qt-4.8/qml-text.html}{Text} components.
\l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-text.html}{Text} components.
You can change the font family and size as well as text formatting, style,
alignment, and color.
@@ -79,7 +79,7 @@
\section1 Previewing Animation
The Qt Quick Toolbar for animation allows you to edit the properties of
\l{http://qt-project.org/doc/qt-4.8/qml-propertyanimation.html}
\l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-propertyanimation.html}
{PropertyAnimation} components and the components that inherit it. You can
change the easing curve type and duration. For some curves, you can also
specify amplitude, period, and overshoot values.
@@ -91,7 +91,7 @@
\section1 Editing Rectangles
The Qt Quick Toolbar for rectangles allows you to edit the properties of
\l{http://qt-project.org/doc/qt-4.8/qml-rectangle.html}{Rectangle}
\l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-rectangle.html}{Rectangle}
components. You can change the fill and border colors and add
gradients.