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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits)
  Fix autotest failure caused by commit 92365268
  Cleanup changelog for 4.7.1.
  QNAM: Do not need QNetworkSession for data://
  Workaround for QFileSystemWatcher regression
  Revert "qmake: pass include directories to MS resource compiler"
  Fix User 46 Panic in bearer management on Symbian.
  Assistant: Insert all keywords with empty ids, as ids are not mendatory.
  qmake: delete .pdb file when making 'distclean' instead of 'clean'
  qmake: pass include directories to MS resource compiler
  use specified pkg-config
  qmake/symbian: Add icons with backslashes in pkg files
  Make qtconfig help messages translatable
  remove exec bits again ...
  Add TIFFClose to QTIffHandler::option() to avoid memory leak
  [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows
  Added missing QtWebKit example files and some whitespace fixes.
  Added missing native separator transforms.
  Doc: tuning search reasult box
  qdoc: Don't generate html output for png files.
  Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
  ...

1 files changed, 13 insertions, 8 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeevents.cpp b/src/declarative/graphicsitems/qdeclarativeevents.cpp
index dbfb3fb..61fd562 100644
--- a/src/declarative/graphicsitems/qdeclarativeevents.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeevents.cpp
@@ -113,11 +113,13 @@ Item {
     \qmlclass MouseEvent QDeclarativeMouseEvent
     \since 4.7
     \ingroup qml-event-elements
-    
+
     \brief The MouseEvent object provides information about a mouse event.
 
-    The position of the mouse can be found via the x and y properties.
-    The button that caused the event is available via the button property.
+    The position of the mouse can be found via the \l x and \l y properties.
+    The button that caused the event is available via the \l button property.
+
+    \sa MouseArea
 */
 
 /*!
@@ -129,7 +131,7 @@ Item {
     \qmlproperty int MouseEvent::x
     \qmlproperty int MouseEvent::y
 
-    These properties hold the position of the mouse event.
+    These properties hold the coordinates of the position supplied by the mouse event.
 */
 
 
@@ -186,7 +188,7 @@ Item {
     It contains a bitwise combination of:
     \list
     \o Qt.NoModifier - No modifier key is pressed.
-    \o Qt.ShiftModifier	- A Shift key on the keyboard is pressed.
+    \o Qt.ShiftModifier - A Shift key on the keyboard is pressed.
     \o Qt.ControlModifier - A Ctrl key on the keyboard is pressed.
     \o Qt.AltModifier - An Alt key on the keyboard is pressed.
     \o Qt.MetaModifier - A Meta key on the keyboard is pressed.
@@ -195,9 +197,12 @@ Item {
 
     For example, to react to a Shift key + Left mouse button click:
     \qml
-MouseArea {
-    onClicked: { if (mouse.button == Qt.LeftButton && mouse.modifiers & Qt.ShiftModifier) doSomething(); }
-}
+    MouseArea {
+        onClicked: {
+            if (mouse.button == Qt.LeftButton && mouse.modifiers & Qt.ShiftModifier)
+                doSomething();
+        }
+    }
     \endqml
 */