Focus changes to QFxItem and QFxView.

Remove QFxItem::activeFocus, make QFxItem::focus behave like
QGraphicsItem::focus (same as activeFocus essentially). Introduce
QFxItem::wantsFocus to provide the same behavior as QFxItem::focus used
to.

Also updated the focusScope manual tests to reflect this new behavior.

This change is going to break every example that relies on activeFocus.
The fix is to replace all references with "focus" instead. All places
that bind to "focus" should now bind to "wantsFocus" instead.

Reviewed-by: akennedy

1 files changed, 4 insertions, 2 deletions

diff --git a/src/declarative/util/qfxview.cpp b/src/declarative/util/qfxview.cpp
index 2a38cda..19dfe2c 100644
--- a/src/declarative/util/qfxview.cpp
+++ b/src/declarative/util/qfxview.cpp
@@ -498,9 +498,10 @@ void QFxView::paintEvent(QPaintEvent *event)
   This virtual function does nothing with the event \a e
   in this class.
  */
-void QFxView::focusInEvent(QFocusEvent *)
+void QFxView::focusInEvent(QFocusEvent *e)
 {
     // Do nothing (do not call QWidget::update())
+    QGraphicsView::focusInEvent(e);
 }
 
 
@@ -508,9 +509,10 @@ void QFxView::focusInEvent(QFocusEvent *)
   This virtual function does nothing with the event \a e
   in this class.
  */
-void QFxView::focusOutEvent(QFocusEvent *)
+void QFxView::focusOutEvent(QFocusEvent *e)
 {
     // Do nothing (do not call QWidget::update())
+    QGraphicsView::focusOutEvent(e);
 }
 
 QT_END_NAMESPACE