diff --git a/doc/src/debugger/qtquick-debugger-example.qdoc b/doc/src/debugger/qtquick-debugger-example.qdoc
index 28b2f3d820b709e7ec90e59b99b7acc63e83c106..00bc9b5928cd47b62a16b765d8d0607053f5cb01 100644
--- a/doc/src/debugger/qtquick-debugger-example.qdoc
+++ b/doc/src/debugger/qtquick-debugger-example.qdoc
@@ -31,8 +31,8 @@
\title Debugging a Qt Quick Example Application
This section uses the
- \l{http://qt-project.org/doc/qt-4.8/demos-declarative-samegame.html}{Same Game}
- demo application to illustrate how to debug Qt Quick applications in the
+ \l{http://qt-project.org/doc/qt-5.0/qtquick/qtquick2-qml-advtutorial.html}{Same Game}
+ example application to illustrate how to debug Qt Quick applications in the
\gui Debug mode.
For more information about all the options you have, see
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc
index 783251af25824a508b0a9a4afe91051a462b7ba1..e8ab8a66a7f50fa07c4ad8094e446761371a099b 100644
--- a/doc/src/editors/creator-editors.qdoc
+++ b/doc/src/editors/creator-editors.qdoc
@@ -1250,7 +1250,7 @@
\gui {Regular Expressions}.
Regular expressions used in \QC are modeled on Perl regular
expressions. For more information on using regular expressions, see
- \l {http://qt-project.org/doc/qt-4.8/qregexp.html#details}
+ \l{http://qt-project.org/doc/qt-5.0/qtcore/qregexp.html#details}
{Detailed Description} in the QRegExp Class Reference.
\endlist
diff --git a/doc/src/howto/creator-external-tools.qdoc b/doc/src/howto/creator-external-tools.qdoc
index 0d8240255f7f56c33a147a4e72c8bef9cc8f3a34..28d00f4485521fcf33aa65ac562390997cc62734 100644
--- a/doc/src/howto/creator-external-tools.qdoc
+++ b/doc/src/howto/creator-external-tools.qdoc
@@ -56,7 +56,7 @@
External > Configure}.
For more information about Qt Linguist, see
- \l{http://qt-project.org/doc/qt-4.8/linguist-manual.html}
+ \l{http://qt-project.org/doc/qt-5.0/qtlinguist/qtlinguist-index.html}
{Qt Linguist Manual}.
\section1 Previewing QML Files
diff --git a/doc/src/howto/creator-help.qdoc b/doc/src/howto/creator-help.qdoc
index b11f4dad2b88f9bfb49c2af8432d83b68547041f..3d7c8fd387473007eea22b5fc5de726e266e5c71 100644
--- a/doc/src/howto/creator-help.qdoc
+++ b/doc/src/howto/creator-help.qdoc
@@ -176,7 +176,7 @@
For information on how to prepare your documentation and create a
.qch file, see
- \l{http://qt-project.org/doc/qt-4.8/qthelp-framework.html}
+ \l{http://qt-project.org/doc/qt-5.0/qthelp/qthelp-framework.html}
{The Qt Help Framework}.
\li To add the .qch file to \QC, select \gui Tools > \gui Options >
diff --git a/doc/src/linux-mobile/creator-deployment-madde.qdoc b/doc/src/linux-mobile/creator-deployment-madde.qdoc
index b6911b2c3fee585f390425010b5d15a8e51a76f1..cabf454c554e07c6663a39fa075c4e5b5f58c350 100644
--- a/doc/src/linux-mobile/creator-deployment-madde.qdoc
+++ b/doc/src/linux-mobile/creator-deployment-madde.qdoc
@@ -43,7 +43,7 @@
\gui {Remote Directory} field displays the folder where the file is
installed on the device. Text in red color indicates that the information is
missing. Edit the qmake
- \l{http://qt-project.org/doc/qt-4.8/qmake-variable-reference.html#installs}
+ \l{http://qt-project.org/doc/qt-5.0/qtdoc/qmake-variable-reference.html#installs}
{INSTALLS variable} in the project .pro file to add the missing files.
When you run the application, \QC copies the necessary files to the device
diff --git a/doc/src/overview/creator-glossary.qdoc b/doc/src/overview/creator-glossary.qdoc
index 9226d75e31290c3042ba85834c9709234105d257..cd38594a830e3a71e18a9c9d23a487e6ada595cd 100644
--- a/doc/src/overview/creator-glossary.qdoc
+++ b/doc/src/overview/creator-glossary.qdoc
@@ -68,7 +68,7 @@
be defined in Button.qml. The QML runtime may instantiate this
Button component to create Button objects. Alternatively, a
component may be defined inside a
- \l{http://qt-project.org/doc/qt-4.8/qmlreusablecomponents.html}
+ \l{http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-component.html}
{Component} element.
\row
diff --git a/doc/src/overview/creator-overview.qdoc b/doc/src/overview/creator-overview.qdoc
index 79b220420a3d5d69053968063471cd3478061f57..da2510a98ca66476cecda18ad45fd12fc8f7a0fb 100644
--- a/doc/src/overview/creator-overview.qdoc
+++ b/doc/src/overview/creator-overview.qdoc
@@ -59,7 +59,7 @@
\QC provides two integrated visual editors, \QMLD and \QD.
To create intuitive, modern-looking, fluid user interfaces, you
- can use \l {http://qt-project.org/doc/qt-4.8/qtquick.html}
+ can use \l{http://qt-project.org/doc/qt-5.0/qtquick/qtquick-index.html}
{Qt Quick}.
If you need a traditional user interface that is clearly
structured and enforces a platform look and feel, you can use
diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc
index 1cbdc0f95fa40495312657faa43810df762cb8ad..0cb97b5d98a2a8c2d29a44207b7e31c711e2ab2d 100644
--- a/doc/src/projects/creator-projects-creating.qdoc
+++ b/doc/src/projects/creator-projects-creating.qdoc
@@ -56,8 +56,7 @@
automates the generation of build configurations so that only a few lines
of information are needed to create each configuration. For more
information about qmake, see the
- \l{http://qt-project.org/doc/qt-4.8/qmake-manual.html}{qmake Manual}.
-
+ \l{http://qt-project.org/doc/qt-5.0/qtdoc/qmake-manual.html}{qmake Manual}.
You can modify the build and run settings for qmake projects in the
\gui Projects mode.
@@ -334,7 +333,7 @@
Qt provides support for integration with OpenGL implementations on all
platforms, which allows you to display hardware accelerated 3D graphics
alongside a more conventional user interface. For more information, see
- \l{http://qt-project.org/doc/qt-4.8/qtopengl.html}{QtOpenGL Module}.
+ \l{http://qt-project.org/doc/qt-5.0/qtopengl/qtopengl-index.html}{Qt OpenGL}.
You can use the QGLShader class to compile OpenGL shaders written in the
OpenGL Shading Language (GLSL) and in the OpenGL/ES Shading Language
@@ -388,7 +387,7 @@
The wizard creates a project file (.pro) that defines a \c subdirs template
and the subproject that you add as a value of the
- \l{http://qt-project.org/doc/qt-4.8/qmake-variable-reference.html#subdirs}
+ \l{http://qt-project.org/doc/qt-5.0/qtdoc/qmake-variable-reference.html#subdirs}
{SUBDIRS variable}. It also adds all the necessary files for the subproject.
To add more subprojects, right-click the project name in the \gui Projects
diff --git a/doc/src/projects/creator-projects-libraries.qdoc b/doc/src/projects/creator-projects-libraries.qdoc
index 313610191e6d10f2001470b142047163cfd35640..e95b8d27f30d26fb3d762e542eb63adf8acf0c7e 100644
--- a/doc/src/projects/creator-projects-libraries.qdoc
+++ b/doc/src/projects/creator-projects-libraries.qdoc
@@ -90,7 +90,7 @@
\endlist
For more information about the project file settings, see
- \l{http://qt-project.org/doc/qt-4.8/qmake-project-files.html#declaring-other-libraries}
+ \l{http://qt-project.org/doc/qt-5.0/qtdoc/qmake-project-files.html#declaring-other-libraries}
{Declaring Other Libraries}.
\section1 Example of Adding Internal Libraries
diff --git a/doc/src/projects/creator-projects-overview.qdoc b/doc/src/projects/creator-projects-overview.qdoc
index f9f2bd5b83adcbae19cfc5880c6ea0e1289becbc..072368a03e7831ed010c81f38deb60e4a16d6707 100644
--- a/doc/src/projects/creator-projects-overview.qdoc
+++ b/doc/src/projects/creator-projects-overview.qdoc
@@ -60,7 +60,7 @@
{shadow builds} are used to keep the build specific files separate
from the source. You can create separate versions of project files
to keep platform-dependent code separate. You can use qmake
- \l{http://qt-project.org/doc/qt-4.8/qmake-tutorial.html#adding-platform-specific-source-files}
+ \l{http://qt-project.org/doc/qt-5.0/qtdoc/qmake-tutorial.html#adding-platform-specific-source-files}
{scopes} to select the file to process depending on which platform
qmake is run on.
diff --git a/doc/src/qnx/creator-deployment-qnx.qdoc b/doc/src/qnx/creator-deployment-qnx.qdoc
index 4b35f41af4f4cebe131006fe5fed5882886489dc..93435787a88848f4e117420b2454d77e60d05232 100644
--- a/doc/src/qnx/creator-deployment-qnx.qdoc
+++ b/doc/src/qnx/creator-deployment-qnx.qdoc
@@ -73,7 +73,7 @@
\gui {Remote Directory} field displays the folder where the file is
installed on the device. Text in red color indicates that the information is
missing. Edit the qmake
- \l{http://qt-project.org/doc/qt-4.8/qmake-variable-reference.html#installs}
+ \l{http://qt-project.org/doc/qt-5.0/qtdoc/qmake-variable-reference.html#installs}
{INSTALLS variable} in the project .pro file to add the missing files.
When you run the application, \QC copies the necessary files to the device
diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc
index 290a0ecd8f7e3aedcb71c237f7de1afd0e1b1e7c..e3b40cd3be5cf744800f85989fb04a2a98a9f887 100644
--- a/doc/src/qtquick/qtquick-app-development.qdoc
+++ b/doc/src/qtquick/qtquick-app-development.qdoc
@@ -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}.
*/
diff --git a/doc/src/qtquick/qtquick-buttons.qdoc b/doc/src/qtquick/qtquick-buttons.qdoc
index c5f84c0ee90d06515ff3d42593f79bbeb6f7edcd..844e89a5739f6683ccb4596d172a4eec36f05a33 100644
--- a/doc/src/qtquick/qtquick-buttons.qdoc
+++ b/doc/src/qtquick/qtquick-buttons.qdoc
@@ -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.
diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc
index 34e6eb7a28106639553a2e5a3b0e931b87caaea9..2068de9a701f9914bf0ade95977ae1ed70b1f256 100644
--- a/doc/src/qtquick/qtquick-components.qdoc
+++ b/doc/src/qtquick/qtquick-components.qdoc
@@ -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
diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc
index 9fae123be4d9520dbd1814e8d4ae91a5c9b4da50..5900f37b5da4065387d9c1a2ecb963afa4232558 100644
--- a/doc/src/qtquick/qtquick-creating.qdoc
+++ b/doc/src/qtquick/qtquick-creating.qdoc
@@ -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.
diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc
index ddf778a8430f4c121db4ef957be6a7b0e858f45e..9aa08124345e790c2522c54a1f71f64a4a991048 100644
--- a/doc/src/qtquick/qtquick-designer.qdoc
+++ b/doc/src/qtquick/qtquick-designer.qdoc
@@ -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"
diff --git a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc b/doc/src/qtquick/qtquick-modules-with-plugins.qdoc
index 84db5341d22cb9882eec9b72dae6f05bc7b9e7e6..f41d6058d6e60c74ea60cbbfaff1d3c0cb889aba 100644
--- a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc
+++ b/doc/src/qtquick/qtquick-modules-with-plugins.qdoc
@@ -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
diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc
index 20af4e9da9cdff1359299ea01dfd0a91512a43ba..6ecb5e90d0b21e91b43f92d1f113113e7b720ecb 100644
--- a/doc/src/qtquick/qtquick-screens.qdoc
+++ b/doc/src/qtquick/qtquick-screens.qdoc
@@ -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
diff --git a/doc/src/qtquick/qtquick-toolbars.qdoc b/doc/src/qtquick/qtquick-toolbars.qdoc
index 6b34e646361ce34d2996ef399f74de05eb8aa040..3f89bf7f968431cd3d84bf50dcfca456752369f5 100644
--- a/doc/src/qtquick/qtquick-toolbars.qdoc
+++ b/doc/src/qtquick/qtquick-toolbars.qdoc
@@ -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.
diff --git a/doc/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
index 7d622bee9d4a68463cb02a226efb882ab22d3a44..65a58b88a434a0f028a55e95516ebd1ac14d33eb 100644
--- a/doc/src/widgets/qtdesigner-app-tutorial.qdoc
+++ b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
@@ -31,9 +31,9 @@
\title Creating a Qt Widget Based Application
This tutorial describes how to use \QC to create a small Qt application,
- Text Finder. It is a simplified version of the QtUiTools
- \l{http://qt-project.org/doc/qt-4.8/uitools-textfinder.html}{Text Finder}
- example. The application user interface is constructed from Qt widgets by
+ Text Finder. It is a simplified version of the Qt UI Tools
+ \l{http://qt-project.org/doc/qt-5.0/qtuitools/textfinder.html}{Text Finder
+ example}. The application user interface is constructed from Qt widgets by
using \QD. The application logic is written in C++ by using the code editor.
\image qtcreator-textfinder-screenshot.png
@@ -198,7 +198,7 @@
\endlist
For more information about designing forms with \QD, see the
- \l{http://qt-project.org/doc/qt-4.8/designer-manual.html}{Qt Designer Manual}.
+ \l{http://qt-project.org/doc/qt-5.0/qtdesigner/qtdesigner-manual.html}{Qt Designer Manual}.
\section2 Completing the Header File
@@ -232,7 +232,7 @@
\li Add code to load a text file using QFile, read it with QTextStream,
and then display it on \c{textEdit} with
- \l{http://qt-project.org/doc/qt-4.8/qtextedit.html#plainText-prop}
+ \l{http://qt-project.org/doc/qt-5.0/qtwidgets/qtextedit.html#plainText-prop}
{setPlainText()}.
This is illustrated by the following code snippet:
@@ -245,7 +245,7 @@
\li For the \c{on_findButton_clicked()} slot, add code to extract the
search string and use the
- \l{http://qt-project.org/doc/qt-4.8/qtextedit.html#find}{find()}
+ \l{http://qt-project.org/doc/qt-5.0/qtwidgets/qtextedit.html#find}{find()}
function
to look for the search string within the text file. This is
illustrated by the following code snippet:
diff --git a/doc/src/widgets/qtdesigner-overview.qdoc b/doc/src/widgets/qtdesigner-overview.qdoc
index 183dd049a726beeb884f0e59bb33dc86f1f5d00c..7ed9eec67b62065cfa18e9fcde58c424c83c82ae 100644
--- a/doc/src/widgets/qtdesigner-overview.qdoc
+++ b/doc/src/widgets/qtdesigner-overview.qdoc
@@ -36,7 +36,7 @@
\image qtcreator-formedit.png
For more information about \QD, see the
- \l{http://qt-project.org/doc/qt-4.8/designer-manual.html}{Qt Designer Manual}.
+ \l{http://qt-project.org/doc/qt-5.0/qtdesigner/qtdesigner-manual.html}{Qt Designer Manual}.
Generally, the integrated \QD contains the same functions as the standalone
\QD. The following sections describe the differences.
diff --git a/doc/src/widgets/qtdesigner-plugins.qdoc b/doc/src/widgets/qtdesigner-plugins.qdoc
index 36993ab16f290bf101d99bfc832cea7982e7d725..58b160b6e71824839d11cb614dfdead3517a9494 100644
--- a/doc/src/widgets/qtdesigner-plugins.qdoc
+++ b/doc/src/widgets/qtdesigner-plugins.qdoc
@@ -41,7 +41,7 @@
and to change the default plugin path, see \l{How to Create Qt Plugins}.
For more information about how to create plugins for \QD, see
- \l{http://qt-project.org/doc/qt-4.8/designer-using-custom-widgets.html}
+ \l{http://qt-project.org/doc/qt-5.0/qtdesigner/designer-using-custom-widgets.html}
{Using Custom Widgets with Qt Designer}.
\section1 Locating Qt Designer Plugins
@@ -75,7 +75,7 @@
\QC uses its own set of Qt Libraries located in the bundle, and therefore,
you need to configure the \QD plugins that you want to use with \QC.
Fore more information about how to deploy applications to Mac OS, see
- \l{http://qt-project.org/doc/qt-4.8/deployment-mac.html}
+ \l{http://qt-project.org/doc/qt-5.0/qtdoc/deployment-mac.html}
{Deploying an Application on Mac OS X}.
The following example illustrates how to configure version 5.2.1 of the