From ef9f85ad8d2774cb11cbd8cfc5943af2dcf72339 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Mon, 30 Dec 2013 12:15:09 +0800 Subject: Doc: Fix broken links MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4c4577edde96978a986606bf30fbb925f871bd42 Reviewed-by: Topi Reiniö --- src/qml/doc/src/qmllanguageref/documents/scope.qdoc | 5 +++-- src/qml/doc/src/qmllanguageref/documents/structure.qdoc | 4 ++-- src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc | 5 +++-- src/qml/doc/src/qmllanguageref/modules/topic.qdoc | 6 +++--- src/qml/doc/src/qmllanguageref/syntax/imports.qdoc | 2 +- src/qml/doc/src/qmllanguageref/syntax/signals.qdoc | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) (limited to 'src/qml/doc/src/qmllanguageref') diff --git a/src/qml/doc/src/qmllanguageref/documents/scope.qdoc b/src/qml/doc/src/qmllanguageref/documents/scope.qdoc index 870eb21a07..845ca30b4f 100644 --- a/src/qml/doc/src/qmllanguageref/documents/scope.qdoc +++ b/src/qml/doc/src/qmllanguageref/documents/scope.qdoc @@ -79,7 +79,7 @@ with local variables declared in another. \l {QML Documents} include import statements that define the type names and JavaScript files visible to the document. In addition to their use in the QML declaration itself, type names are used by JavaScript code when accessing -\l {Attached Properties} and enumeration values. +\l {Attached Properties and Attached Signal Handlers}{attached properties} and enumeration values. The effect of an import applies to every property binding, and JavaScript function in the QML document, even those in nested inline components. The @@ -123,7 +123,8 @@ directly, without needing any form of object prefix. QML introduces a more structured, object-oriented approach to JavaScript, and consequently does not require the use of the JavaScript \c this property. -Care must be used when accessing \l {Attached Properties} from bindings due +Care must be used when accessing \l {Attached Properties and Attached Signal Handlers} +{attached properties} from bindings due to their interaction with the scope object. Conceptually attached properties exist on \e all objects, even if they only have an effect on a subset of those. Consequently unqualified attached property reads will always resolve to an diff --git a/src/qml/doc/src/qmllanguageref/documents/structure.qdoc b/src/qml/doc/src/qmllanguageref/documents/structure.qdoc index c8176f7e0f..e526e47b00 100644 --- a/src/qml/doc/src/qmllanguageref/documents/structure.qdoc +++ b/src/qml/doc/src/qmllanguageref/documents/structure.qdoc @@ -57,8 +57,8 @@ presentation to the \l{QQmlEngine}{QML engine}, unlike C or C++. The \c import statements do not copy and prepend the code in the document, but instead instruct the QML engine on how to resolve type references found in the document. Any type reference present in a QML document - such as \c -Rectangle and \c ListView - including those made within an \l {Inline -JavaScript}{JavaScript block} or \l {Property Binding}{property +Rectangle and \c ListView - including those made within a \l {JavaScript +Expressions in QML Documents}{JavaScript block} or \l {Property Binding}{property bindings}, are \e resolved based exclusively on the import statements. At least one \c import statement must be present such as \c{import QtQuick 2.0}. diff --git a/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc b/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc index 57d54e27e0..c89d4a3c0d 100644 --- a/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc +++ b/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc @@ -62,7 +62,7 @@ module The is the (dotted URI notation) identifier for the module, which must match the module's install path. - The \l{qtqml-modules-topic.html#the-module-identifier-directive} + The \l{Identified Modules#Semantics of Identified Modules} {module identifier directive} must be the first line of the file. Exactly one module identifier directive may exist in the \c qmldir file. @@ -113,7 +113,8 @@ internal MyPrivateType MyPrivateType.qml \endcode This is necessary if the module may be imported remotely (see - \l{Remotely Installed Modules}) because if an exported type depends + \l{Identified Modules#Remotely Installed Identified Modules} + {Remotely Installed Identified Modules}) because if an exported type depends on an non-exported type within the module, the engine must also load the non-exported type. diff --git a/src/qml/doc/src/qmllanguageref/modules/topic.qdoc b/src/qml/doc/src/qmllanguageref/modules/topic.qdoc index 597e7b7ca3..9d4173a883 100644 --- a/src/qml/doc/src/qmllanguageref/modules/topic.qdoc +++ b/src/qml/doc/src/qmllanguageref/modules/topic.qdoc @@ -64,15 +64,15 @@ The directory can then be installed into the \l{qtqml-syntax-imports.html#qml-import-path}{QML import path} as a module. Note that defining a module is not the only way to share common QML types -within a project - a simple \l{qtqml-syntax-imports.html#directory-import} +within a project - a simple \l{Importing QML Document Directories} {QML document directory import} may also be used for this purpose. \section1 Supported QML Module Types There are two different types of modules supported by QML: \list -\li \l{qtqml-modules-identifiedmodules.html}{Identified Modules} -\li \l{qtqml-modules-legacymodules.html}{Legacy Modules} (deprecated) +\li \l{Identified Modules} +\li \l{Legacy Modules} (deprecated) \endlist Identified modules explicitly define their identifier and are installed into diff --git a/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc b/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc index 1496a1e5c9..0939a460fe 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc @@ -281,7 +281,7 @@ JavaScript resources, please see the in-depth documentation about \section1 QML Import Path -When an \l{qtqml-modules-installedmodules.html}{installed module} is imported, +When an \l{Identified Modules}{identified module} is imported, the QML engine searches the \e{import path} for a matching module. This import path, as returned by QQmlEngine::importPathList(), defines the diff --git a/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc b/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc index 6344d16caa..b9f391e4dc 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc @@ -142,7 +142,7 @@ Rectangle { \section2 Attached Signal Handlers -An \l {attached signal handler} is a signal handler that receives a signal from an \e {attaching type} rather than the object within which the handler is declared. +An \l {Attached Properties and Attached Signal Handlers}{attached signal handler} is a signal handler that receives a signal from an \e {attaching type} rather than the object within which the handler is declared. For example, \c \l {Component::isCompleted}{Component.isCompleted} is an attached signal handler. This handler is often used to execute some JavaScript code when its creation process has been completed, as in the example below: -- cgit v1.2.3