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: (76 commits)
  Reseted QtDeclarative module def files
  Get WebView tests passing again
  Remove arbitrary width checks
  Removed compilation warning for systems with no OpenGL support
  Fix bug in SameGame's dialog component
  doc fix
  Add abstractitemmodel example, and fix some model docs
  docs - quote code with snippets, other improvements
  Fix webkit import for webkit tests.
  Remove qmlviewer dependency on QDeclarativeTimer
  Remove a few more unnecessary exports.
  Don't export declarative private classes
  Add additional text layout benchmarks.
  Don't access uninitialized value.
  Minor Twitter demo enhancements
  Added SET_BINDING message to QDeclarative debugger protocol
  Add ListView.nextSection attached property
  Remove the old font.outline documentation
  Docs - add more links to relevant examples
  Rewrite runtime & qmlviewer docs and emphasise that qmlviewer shouldn't
  ...

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}
 */
 
 /*!