Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4

Conflicts:
	src/imports/qtquick2/plugins.qmltypes
	src/qml/debugger/qv8debugservice.cpp
	src/qml/qml/qml.pri
	src/qml/qml/qqmlcompiler.cpp
	src/qml/qml/qqmlcomponent.cpp
	src/qml/qml/qqmlcontext.cpp
	src/qml/qml/qqmldata_p.h
	src/qml/qml/qqmlengine_p.h
	src/qml/qml/qqmljavascriptexpression.cpp
	src/qml/qml/qqmlxmlhttprequest.cpp
	src/qml/qml/v4/qv4bindings.cpp
	src/qml/qml/v4/qv4irbuilder.cpp
	src/qml/qml/v4/qv4jsonobject_p.h
	src/qml/qml/v8/qqmlbuiltinfunctions.cpp
	src/qml/qml/v8/qv8bindings.cpp
	src/qml/qml/v8/qv8contextwrapper.cpp
	src/qml/qml/v8/qv8listwrapper.cpp
	src/qml/qml/v8/qv8qobjectwrapper.cpp
	src/qml/qml/v8/qv8qobjectwrapper_p.h
	src/qml/qml/v8/qv8sequencewrapper_p_p.h
	src/qml/qml/v8/qv8typewrapper.cpp
	src/qml/qml/v8/qv8valuetypewrapper.cpp
	src/qml/types/qqmldelegatemodel.cpp
	src/quick/items/context2d/qquickcanvasitem.cpp
	src/quick/items/context2d/qquickcontext2d.cpp
	sync.profile
	tests/auto/qml/qjsengine/tst_qjsengine.cpp
	tests/benchmarks/qml/animation/animation.pro
	tools/qmlprofiler/qmlprofiler.pro

Change-Id: I18a76b8a81d87523247fa03a44ca334b1a2360c9

1 files changed, 10 insertions, 12 deletions

diff --git a/src/quick/doc/src/concepts/input/focus.qdoc b/src/quick/doc/src/concepts/input/focus.qdoc
index 1c73c9b5ba..827f6d85c8 100644
--- a/src/quick/doc/src/concepts/input/focus.qdoc
+++ b/src/quick/doc/src/concepts/input/focus.qdoc
@@ -27,14 +27,13 @@
 
 /*!
 \page qtquick-input-focus.html
-\ingroup qml-features
 \title Keyboard Focus in Qt Quick
 \brief handling keyboard focus
 
 When a key is pressed or released, a key event is generated and delivered to the
 focused Qt Quick \l Item. To facilitate the construction of reusable components
-and to address some of the cases unique to fluid user interfaces, the Qt Quick items add aged
-\e scope based extension to Qt's traditional keyboard focus model.
+and to address some of the cases unique to fluid user interfaces, the Qt Quick items add a
+scope based extension to Qt's traditional keyboard focus model.
 
 \tableofcontents
 
@@ -43,17 +42,16 @@ and to address some of the cases unique to fluid user interfaces, the Qt Quick i
 When the user presses or releases a key, the following occurs:
 \list 1
 \li Qt receives the key action and generates a key event.
-\li If the Qt widget containing the \l QQuickView has focus, the key event
-is delivered to it. Otherwise, regular Qt key handling continues.
-\li The key event is delivered by the scene to the QML \l Item with
-\e {active focus}. If no Item has active focus, the key event is
-\l {QEvent::ignore()}{ignored} and regular Qt key handling continues.
-\li If the QML Item with active focus accepts the key event, propagation
-stops. Otherwise the event is "bubbled up", by recursively passing it to each
-Item's parent until either the event is accepted, or the root Item is reached.
+\li If a \l QQuickWindow is the active window, the key event
+is delivered to it.
+\li The key event is delivered by the scene to the \l Item with
+\e {active focus}. If no item has active focus, the key event is ignored.
+\li If the \l QQuickItem with active focus accepts the key event, propagation
+stops. Otherwise the event is send to the Item's parent until
+the event is accepted, or the root item is reached.
 
 If the \c {Rectangle} type in the following example has active focus and the \c A key is pressed,
-it will bubble up to its parent. However, pressing the \c B key will bubble up to the root
+the event will not be propagated further. Pressing the \c B key the event will propagate to the root
 item and thus subsequently be ignored.
 
 \snippet qml/focus/rectangle.qml simple key event