Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (39 commits)
  Document - and use - the qmlRegisterXXX template functions
  when loading debug import plugins on Mac, try with _debug.dylib suffix
  fix inclusion of qt_targets.pri in qimportbase.pri
  Use TARGETPATH instead of hardcoding locations
  Fix location in which webkit import is stored in builddir
  Oooops --- revert wrong commit
  Remove accidentally submitted code
  Ensure currentIndex NOTIFY is emitted when currentIndex changes due to model change.
  Unify binding optimizer and QtScript binding signal management logic
  Schedule view relayout after itemsInserted/Removed()
  Use no-version-specified to mean any version (used to work, fixed again,
  URL redirection for font loader
  URL redirection for AnimatedImage
  Technically, Location can be relative (never is though...)
  URL redirection for normal images.
  URL redirection for components resources.
  URL redirects for border image.
  Implement URL redirection for types and XmlListModel.
  Doc
  Link with the correct library for TCommDbConnPref
  ...

1 files changed, 0 insertions, 2 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
index 6183b1d..b1682c4 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
@@ -215,8 +215,6 @@ protected:
     void keyPressEvent(QKeyEvent *);
     void keyReleaseEvent(QKeyEvent *);
 
-    void focusChanged(bool);
-
     // mouse filter?
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);