Remove redundant QFxItem::activeFocusChanged(); is not used anywhere,

presumedly replaced by QFxItem::focusChanged().

6 files changed, 5 insertions, 24 deletions

diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index 028b5f0..dd5dcaf 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -35,12 +35,12 @@ Item {
 \section1 Querying the Active Focus Item
 
 Whether or not an \l Item has \e {active focus} can be queried through the
-read-only property \c {Item::activeFocus}.  For example, here we have a \l Text
+read-only property \c {Item::focus}.  For example, here we have a \l Text
 element whose text is determined by whether or not it has \e {active focus}.
 
 \code
 Text {
-    text: activeFocus ? "I have active focus!" : "I do not have active focus"
+    text: focus ? "I have active focus!" : "I do not have active focus"
 }
 \endcode
 
@@ -167,7 +167,7 @@ Conceptually \e {focus scopes} are quite simple.
 \o Within each \e {focus scope} one element may have \c {Item::focus} set to true.  If more than one \l Item has the \c {Item::focus} property set, the first is selected and the others are unset, just like when there are no \e {focus scopes}.
 \o When a \e {focus scope} receives \e {active focus}, the contained element with \c {Item::focus} set (if any) also gets \e {active focus}.  If this element is
 also a \l FocusScope, the proxying behaviour continues.  Both the
-\e {focus scope} and the sub-focused item will have \c {Item::activeFocus} set.
+\e {focus scope} and the sub-focused item will have \c {Item::focus} set.
 \endlist
 
 So far the example has the second component statically selected.  It is trivial
diff --git a/doc/src/tutorials/declarative.qdoc b/doc/src/tutorials/declarative.qdoc
index 48beabd..bbc3d15 100644
--- a/doc/src/tutorials/declarative.qdoc
+++ b/doc/src/tutorials/declarative.qdoc
@@ -500,7 +500,7 @@
         to receive focus
     \endlist
 
-    The read-only property activeFocus can be used to determine whether a
+    The read-only property focus can be used to determine whether a
     component will receive key input.  Any un-handled keys will be passed to
     the components parent, which in turn will pass keys it doesn't handle up to its
     own ancestors.
diff --git a/examples/examples.pro b/examples/examples.pro
index 7acd67b..c53bc7d 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -46,7 +46,6 @@ contains(QT_CONFIG, multimedia) {
 contains(QT_CONFIG, script): SUBDIRS += script
 
 contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon
-contains(QT_CONFIG, webkit): SUBDIRS += webkit
 embedded:SUBDIRS += qws
 !wince*:!symbian: {
 	!contains(QT_EDITION, Console):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index 4d31aaa..6a9af1b 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -1257,12 +1257,6 @@ QFxKeysAttached *QFxKeysAttached::qmlAttachedProperties(QObject *obj)
 */
 
 /*!
-    \fn void QFxItem::activeFocusChanged()
-
-    This signal is emitted when this item gains active focus.
-*/
-
-/*!
     \fn void QFxItem::baselineOffsetChanged()
 
     This signal is emitted when the baseline offset of the item
@@ -2260,16 +2254,6 @@ void QFxItem::setKeepMouseGrab(bool keep)
 }
 
 /*!
-  This function emits the \e activeFocusChanged signal.
-  \a flag is not used.
- */
-void QFxItem::activeFocusChanged(bool flag)
-{
-    Q_UNUSED(flag);
-    emit activeFocusChanged();
-}
-
-/*!
   This function emits the \e focusChanged signal.
 
   Subclasses overriding this function should call up
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h
index 30c522f..674940d 100644
--- a/src/declarative/fx/qfxitem.h
+++ b/src/declarative/fx/qfxitem.h
@@ -166,7 +166,6 @@ Q_SIGNALS:
     void stateChanged(const QString &);
     void focusChanged();
     void wantsFocusChanged();
-    void activeFocusChanged();
     void parentChanged();
 
 protected:
@@ -183,7 +182,6 @@ protected:
     virtual void classBegin();
     virtual void componentComplete();
     virtual void focusChanged(bool);
-    virtual void activeFocusChanged(bool);
     virtual void keyPressEvent(QKeyEvent *event);
     virtual void keyReleaseEvent(QKeyEvent *event);
     virtual void inputMethodEvent(QInputMethodEvent *);
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index f4c2e4c..7eb25a8 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -822,7 +822,7 @@ void QFxTextEdit::keyReleaseEvent(QKeyEvent *event)
     \overload
     Handles changing of the focus property.  Focus is applied to the control
     even if the edit does not have active focus.  This is because things
-    like KeyProxy can give the behavior of focus even when activeFocus isn't
+    like KeyProxy can give the behavior of focus even when hasFocus() isn't
     true.
 */
 void QFxTextEdit::focusChanged(bool hasFocus)