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: (54 commits)
  update qml.qch to version 4.7
  Undefined is undefined, and now qml warns about it
  Fix so window will resize with the root object (broken by
  Avoid duplicate code for testing initial sizes
  Remove an unnecessary connect() in TextInput
  Ensure micro focus is updated in TextEdit and TextInput
  Fix flow layout not taking into account whether it's width and height are implicit or not.
  Avoid binding loop.
  Ensure Loader item change listener is removed when Loader is destroyed
  Adapt all qmlviewer testcases to the code changes in the actual viewer.
  Stop QMLLauncher from crashing on exit on Mac when quitting app via the
  VisualDataModel hasModelChildren role shadowed user roles.
  Allow positioning of ListView items width sub-pixel precision.
  Examples clean up
  Docs
  Improve appearance when scaling
  Tweak Qt Demo Behaviour
  forget to rename the moc include when renaming deviceorientation_maemo.cpp
  fix namespace macros
  fix QML Viewer resize modes
  ...

1 files changed, 2 insertions, 0 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
index a349bec..0342c9f 100644
--- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
@@ -180,6 +180,8 @@ void GraphicsWebView::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
 
     When this item has keyboard focus, all keyboard input will be sent directly to the
     web page within.
+
+    \sa {declarative/modelviews/webview}{WebView example}, {demos/declarative/webbrowser}{Web Browser demo}
 */
 
 /*!