From 7c6c42bc4553ebad555bb105c9b1c6dc5b06e555 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Fri, 30 Nov 2012 15:41:34 +0100 Subject: Rename focus document to make it clear it's not for QML in general Old doc for Qt Quick 1, and qtdeclarative module has its own modified copy already. Change-Id: I5b6c10be59dd4948ba21a2e03f2a61cebf541fcb Reviewed-by: Paul Olav Tvete --- doc/src/declarative/declarativeui.qdoc | 2 +- doc/src/declarative/focus.qdoc | 2 +- doc/src/declarative/propertybinding.qdoc | 2 +- doc/src/declarative/qmlevents.qdoc | 2 +- doc/src/declarative/qmlreusablecomponents.qdoc | 2 +- doc/src/declarative/qmltexthandling.qdoc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc index 3088c6d3..ea1f29b1 100644 --- a/doc/src/declarative/declarativeui.qdoc +++ b/doc/src/declarative/declarativeui.qdoc @@ -64,7 +64,7 @@ Qt applications. \li \l{Anchor-based Layout in QML}{Layouts using Anchors} \li \l{QML Mouse Events}{Mouse Events} \li \l{QML Text Handling and Validators}{Text Handling and Validators} -\li \l{Keyboard Focus in QML}{Keyboard Focus} +\li \l{Keyboard Focus in Qt Quick 1}{Keyboard Focus} \li \l{QML Signal and Handler Event System}{Signal and Handler Event System} \li \l{Importing Reusable Components} \li \l{QML States}{States} diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc index 64118ade..a4c9a543 100644 --- a/doc/src/declarative/focus.qdoc +++ b/doc/src/declarative/focus.qdoc @@ -33,7 +33,7 @@ \previouspage {QML Text Handling and Validators}{Text Handling and Validators} \nextpage {QML Signal and Handler Event System}{Signal and Handler Event System} -\title Keyboard Focus in QML +\title Keyboard Focus in Qt Quick 1 When a key is pressed or released, a key event is generated and delivered to the focused QML \l Item. To facilitate the construction of reusable components diff --git a/doc/src/declarative/propertybinding.qdoc b/doc/src/declarative/propertybinding.qdoc index ab3a5170..652772fe 100644 --- a/doc/src/declarative/propertybinding.qdoc +++ b/doc/src/declarative/propertybinding.qdoc @@ -185,7 +185,7 @@ to provide additional functionality to objects. Two prominent elements, handlers. \snippet doc/src/snippets/declarative/properties.qml attached signal handler -Read the \l{QML Signal and Handler Event System} and the \l{Keyboard Focus in QML} +Read the \l{QML Signal and Handler Event System} and the \l{Keyboard Focus in Qt Quick 1} articles for more information. \section2 List properties diff --git a/doc/src/declarative/qmlevents.qdoc b/doc/src/declarative/qmlevents.qdoc index 80f5c7ac..1acbd37f 100644 --- a/doc/src/declarative/qmlevents.qdoc +++ b/doc/src/declarative/qmlevents.qdoc @@ -29,7 +29,7 @@ \page qmlevents.html \ingroup qml-features \contentspage QML Features -\previouspage {Keyboard Focus in QML}{Keyboard Focus} +\previouspage {Keyboard Focus in Qt Quick 1}{Keyboard Focus} \nextpage Importing Reusable Components \title QML Signal and Handler Event System diff --git a/doc/src/declarative/qmlreusablecomponents.qdoc b/doc/src/declarative/qmlreusablecomponents.qdoc index 6cad62dc..404c6aa7 100644 --- a/doc/src/declarative/qmlreusablecomponents.qdoc +++ b/doc/src/declarative/qmlreusablecomponents.qdoc @@ -132,7 +132,7 @@ The Button's \c text alias is accessible from outside the component as well as the Rectangle's visual properties and signals such as \c x, \c y, \c anchors, and \c states. -Alternatively, we may choose a \l {Keyboard Focus in QML}{FocusScope} as our +Alternatively, we may choose a \l {Keyboard Focus in Qt Quick 1}{FocusScope} as our top-level object. The \l FocusScope element manage keyboard focus for its children which is beneficial for certain types of interfaces. However, since \c FocusScopes are not visual elements, the visual properties of its child need diff --git a/doc/src/declarative/qmltexthandling.qdoc b/doc/src/declarative/qmltexthandling.qdoc index 3d0c4667..74d18e69 100644 --- a/doc/src/declarative/qmltexthandling.qdoc +++ b/doc/src/declarative/qmltexthandling.qdoc @@ -30,7 +30,7 @@ \title QML Text Handling and Validators \ingroup QML Features \previouspage {QML Mouse Events}{Mouse Events} -\nextpage {Keyboard Focus in QML}{Keyboard Focus} +\nextpage {Keyboard Focus in Qt Quick 1}{Keyboard Focus} \contentspage QML Features \tableofcontents -- cgit v1.2.3