summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2014-02-02 18:05:10 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-06 02:55:20 +0100
commit303f9c27041cdf0ce76fe65057b87436d2561508 (patch)
tree94784018bbdb3921e024daf160debf428b2d6dce
parent068d9ac145c5e90836cc7b8c215263ed8c1566b2 (diff)
Doc: Fix broken links
Change-Id: I84a79c1c355e3ec969b52e3b964810e33fd6e206 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r--doc/src/addons.qdoc2
-rw-r--r--doc/src/core.qdoc2
-rw-r--r--doc/src/datastorage.qdoc2
-rw-r--r--doc/src/frameworks-technologies/accessible.qdoc6
-rw-r--r--doc/src/frameworks-technologies/threads.qdoc8
-rw-r--r--doc/src/getting-started/gettingstartedqml.qdoc4
-rw-r--r--doc/src/platforms/wince-introduction.qdoc4
-rw-r--r--doc/src/qmlapp/internationalization.qdoc8
-rw-r--r--doc/src/qmlapp/performance.qdoc2
-rw-r--r--doc/src/qmlapp/porting.qdoc2
-rw-r--r--doc/src/qmlapp/usecases/visual.qdoc2
-rw-r--r--doc/src/whatsnew/whatsnew50.qdoc20
12 files changed, 28 insertions, 34 deletions
diff --git a/doc/src/addons.qdoc b/doc/src/addons.qdoc
index ac930b045..c3aa5df05 100644
--- a/doc/src/addons.qdoc
+++ b/doc/src/addons.qdoc
@@ -52,7 +52,7 @@ application to better exploit the hardware resources of the platform where it is
\list
\li \l{Threading Basics}
-\li \l{Thread Support}
+\li \l{Thread Support in Qt}
\endlist
\target Qt Declarative
diff --git a/doc/src/core.qdoc b/doc/src/core.qdoc
index ac5d70671..9119ed62d 100644
--- a/doc/src/core.qdoc
+++ b/doc/src/core.qdoc
@@ -98,7 +98,7 @@ platform-independent way.
\list
\li \l{Threading Basics}
-\li \l{Thread Support}
+\li \l{Thread Support in Qt}
\endlist
\section1 Platform Support
diff --git a/doc/src/datastorage.qdoc b/doc/src/datastorage.qdoc
index 3650fe9e0..0535f8313 100644
--- a/doc/src/datastorage.qdoc
+++ b/doc/src/datastorage.qdoc
@@ -223,7 +223,7 @@ QDeclarativeEngine::offlineStoragePath() as SQLite databases
The API conforms to the Synchronous API of the HTML5 Web Database API,
W3C Working Draft 29 October 2009 (\l {HTML5 Web Database API}).
-The \l {SQL Local Storage Example} demonstrates the basics of using the Local
+See \l {Qt Quick Examples - Local Storage} for a basic demonstration of using the Local
Storage API.
\list
diff --git a/doc/src/frameworks-technologies/accessible.qdoc b/doc/src/frameworks-technologies/accessible.qdoc
index 0c5957c37..8f88a9ea0 100644
--- a/doc/src/frameworks-technologies/accessible.qdoc
+++ b/doc/src/frameworks-technologies/accessible.qdoc
@@ -366,8 +366,8 @@
The slider is a complex control that functions as a
\l{QAccessible::}{Controller} for its accessible children.
This relationship must be known by the interface (for
- \l{QAccessibleInterface::}{relationTo()} and
- \l{QAccessibleInterface::}{navigate()}). This can be done
+ \l{QAccessibleInterface::}{parent()}, \l{QAccessibleInterface::}{child()} and
+ \l{QAccessibleInterface::}{relations()}). This can be done
using a controlling signal, which is a mechanism provided by
QAccessibleWidget. We do this in the constructor:
@@ -379,7 +379,7 @@
When an accessible object is changed in a way that users need
to know about, it notifies clients of the change by sending them
an event via the accessible interface. This is how QSlider calls
- \l{QAccessibleInterface::}{updateAccessibility()} to indicate that
+ \l{QAccessible::}{updateAccessibility()} to indicate that
its value has changed:
\snippet snippets/qabstractsliderisnippet.cpp 0
diff --git a/doc/src/frameworks-technologies/threads.qdoc b/doc/src/frameworks-technologies/threads.qdoc
index 99c599cc7..bed6337b8 100644
--- a/doc/src/frameworks-technologies/threads.qdoc
+++ b/doc/src/frameworks-technologies/threads.qdoc
@@ -607,8 +607,7 @@
displaying the results on screen in the main thread when the
worker thread is finished. This is the approach used for
implementing the \l{Mandelbrot Example} and
- the \l{network/blockingfortuneclient}{Blocking Fortune Client}
- example.
+ the \l{Blocking Fortune Client Example}.
\section1 Per-Thread Event Loop
@@ -746,9 +745,8 @@
thread. The thread emits a signal when it is done rendering the
fractal.
- Similarly, the \l{network/blockingfortuneclient}{Blocking Fortune
- Client} example uses a separate thread for communicating with
- a TCP server asynchronously.
+ Similarly, the \l{Blocking Fortune Client Example} uses a separate
+ thread for communicating with a TCP server asynchronously.
*/
/*!
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index bad3b6a0e..a000ba3e8 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -139,7 +139,7 @@
the interactive area where mouse movements are detected. For our button, we anchor the
whole \c MouseArea to its parent, which is \c simpleButton. The \c anchors.fill syntax is
one way of accessing a specific property called \c fill inside a group of properties
- called \c anchors. QML uses \l {Anchor-Based Layout in QML}{anchor-based layouts} where
+ called \c anchors. QML uses \l {Positioning with Anchors}{anchor-based layouts} where
items can anchor to another item, creating robust layouts.
The \c MouseArea has many signal handlers that are called during mouse movements within
@@ -809,7 +809,7 @@
The \c Directory class uses Qt's Meta-Object System to register properties it
needs to accomplish file handling. The \c Directory class is exported as a plugin
and is useable in QML as the \c Directory type. Each of the listed properties
- using the \l Q_PROPERTY macro is a QML property.
+ using the \l Q_PROPERTY() macro is a QML property.
The \l {Q_PROPERTY()}{Q_PROPERTY} declares a property as well as its read and
write functions into Qt's Meta-Object System. For example, the \c filename
diff --git a/doc/src/platforms/wince-introduction.qdoc b/doc/src/platforms/wince-introduction.qdoc
index 4226f0b9c..ed511bec1 100644
--- a/doc/src/platforms/wince-introduction.qdoc
+++ b/doc/src/platforms/wince-introduction.qdoc
@@ -51,7 +51,7 @@
\endlist
\li
\list
- \li \l {Qt for Windows CE Hardware Accelerated Graphics}{Hardware Accelerated Graphics}
+ \li \l {Qt for Windows CE and OpenGL ES}{Hardware Accelerated Graphics}
\endlist
\endtable
*/
@@ -106,6 +106,6 @@
this.
Further information on deploying Qt applications for Windows can
- be found in the \l{Deploying an Application on Windows}
+ be found in the \l{Qt for Windows - Deployment}
{deployment document}.
*/
diff --git a/doc/src/qmlapp/internationalization.qdoc b/doc/src/qmlapp/internationalization.qdoc
index 2ed092bbc..335f23adb 100644
--- a/doc/src/qmlapp/internationalization.qdoc
+++ b/doc/src/qmlapp/internationalization.qdoc
@@ -155,11 +155,11 @@ three hundred and twenty one point fifty six); with English regional settings,
There are no special in-string modifiers for formatting dates and times.
Instead, you need to query the current locale (geographical region) and use the
-methods of \l {QtQuick2::Date}{Date} to format the string.
+methods of \l {QtQml::}{Date} to format the string.
-\c Qt.locale() returns a \l {QtQuick2::Locale}{Locale} object which contains all
+\c Qt.locale() returns a \l {QtQml::}{Locale} object which contains all
kinds of information about the locale. In particular, the \l
-{QtQuick2::Locale::name}{Locale.name} property contains the language and country
+{QtQml::Locale::name}{Locale.name} property contains the language and country
information for the current locale. You can use the value as is, or you can
parse it to determine the appropriate content for the current locale.
@@ -174,7 +174,7 @@ Text {
\endcode
To make sure currency numbers are localized, use the \l
-{QtQuick2::Number}{Number} type. This type has similar functions as the Date
+{QtQml::}{Number} type. This type has similar functions as the Date
type for converting numbers into localized currency strings.
\section2 7. Use QT_TR_NOOP() for Translatable Data Text Strings
diff --git a/doc/src/qmlapp/performance.qdoc b/doc/src/qmlapp/performance.qdoc
index 5d8aa853c..7c53ed3dd 100644
--- a/doc/src/qmlapp/performance.qdoc
+++ b/doc/src/qmlapp/performance.qdoc
@@ -763,7 +763,7 @@ thread (and therefore can cause frames to be skipped if they take too long to co
\section2 Particles
-The \l {QtQuick.Particles 2}{Qt Quick 2.0 Particles} module allows beautiful particle effects to be integrated
+The \l {QtQuick.Particles}{Qt Quick Particles} module allows beautiful particle effects to be integrated
seamlessly into user interfaces. However every platform has different graphics hardware
capabilities, and the Particles module is unable to limit parameters to what your hardware
can gracefully support. The more particles you attempt to render (and the larger they are),
diff --git a/doc/src/qmlapp/porting.qdoc b/doc/src/qmlapp/porting.qdoc
index 5808f83d7..37a20b804 100644
--- a/doc/src/qmlapp/porting.qdoc
+++ b/doc/src/qmlapp/porting.qdoc
@@ -75,7 +75,7 @@ Qt.inputMethod.hide() to show and hide the virtual keyboard.
XmlListModel and XmlRole types must import \e {QtQuick.XmlListModel} instead.
\li The local storage API that enables SQL support has been moved from the \l {QML Global Object}
into a \c QtQuick.LocalStorage singleton type. Any code that requires the local storage API must import
-\e {QtQuick.LocalStorage} instead. See the \l {QtQuick.LocalStorage 2}{QtQuick.LocalStorage} documentation
+\e {QtQuick.LocalStorage} instead. See the \l {QtQuick.LocalStorage}{Qt Quick Local Storage} 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 \l {Qt Quick 1}.
diff --git a/doc/src/qmlapp/usecases/visual.qdoc b/doc/src/qmlapp/usecases/visual.qdoc
index 508515588..aa9b795da 100644
--- a/doc/src/qmlapp/usecases/visual.qdoc
+++ b/doc/src/qmlapp/usecases/visual.qdoc
@@ -43,7 +43,7 @@ a pre-rendered image using the \l Image type.
\section1 The Image Type
\l {Qt Quick} provides an \l Image type which may be used to display images. The
-\l Image type has a \l source property whose value can be a remote or local
+\l Image type has a \l {Image::}{source} property whose value can be a remote or local
URL, or the URL of an image file embedded in a compiled resource file.
\snippet qmlapp/usecases/visual.qml image
diff --git a/doc/src/whatsnew/whatsnew50.qdoc b/doc/src/whatsnew/whatsnew50.qdoc
index 947a2907f..1c8aca586 100644
--- a/doc/src/whatsnew/whatsnew50.qdoc
+++ b/doc/src/whatsnew/whatsnew50.qdoc
@@ -134,11 +134,9 @@
\section2 Type System
\list
- \li New \l{QML Basic Type: var}{var} property type can hold JavaScript
- references.
- \li QML properties of type \l{QML Basic Type: var}{var} and \l{QML Basic
- Type: variant}{variant} can now hold pixmaps. See \l{Scarce Resources
- in JavaScript} for more information.
+ \li New \l{var} property type can hold JavaScript references.
+ \li QML properties of type \l{var} and \l{variant} can now hold pixmaps.
+ See \l{Scarce Resources in JavaScript} for more information.
\li Value type improvements:
\list
\li QColor is now a value type. The red, green, blue and alpha channels
@@ -204,9 +202,8 @@
\endlist
\li Image type now has:
\list
- \li New horizontal and vertical alignment properties, \l{Image::
- Horizontal}{horizontalAlignment} and \l{Image::Horizontal}
- {verticalAlignment}.
+ \li New horizontal and vertical alignment properties, \l{Image::}
+ {horizontalAlignment} and \l{Image::}{verticalAlignment}.
\li \l{Image::fillMode}{Image.Pad} enum value for \c {fillMode}
property does not transform the image unlike the other \c {fillMode}
enum values.
@@ -240,9 +237,8 @@
lines.
\li \l{Text::fontSizeMode}{fontSizeMode} property now supports wrapping
the text to the item size.
- \li \l{Text::minimumPixelSize}{minimumPixelSize} and \l{Text::
- minimumPointSize}{minimumPointSize} properties can be used to
- specify a lower bound when auto-fitting.
+ \li \l{Text::}{minimumPixelSize} and \l{Text::}{minimumPointSize} properties
+ can be used to specify a lower bound when auto-fitting.
\endlist
\li \c {TextEdit::textFormat}{TextEdit.textFormat} property now defaults
to \c PlainText instead of \c AutoText.
@@ -307,7 +303,7 @@
moving of items in a view. For details, see \l{ViewTransition},
\l{ListView::add}{ListView.add}, \l {ListView::addDisplaced}
{ListView.addDisplaced}, \l{GridView::add}{GridView.add}, and
- \l{GridView.addDisplaced}.
+ \l{GridView::addDisplaced}{GridView.addDisplaced}.
\li New \c verticalLayoutDirection property enables items to be laid out
from bottom-to-top using the \c BottomToTop enum value.
\li The \c cacheBuffer property now has a non-zero default and delegates