summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxmouseregion.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-08-19 06:58:56 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-08-19 06:58:56 (GMT)
commit5a44a309ff4d888c57a5648198be6996cdef4c80 (patch)
treeda49d8a7c91be4843b756fd1ece6b0d34eee90f5 /src/declarative/fx/qfxmouseregion.cpp
parentb43625ccbe4337fc645c09e55d1deb021b9b5b19 (diff)
parent51555ed45f6397fa7cdfae771ee6275733bce615 (diff)
downloadQt-5a44a309ff4d888c57a5648198be6996cdef4c80.zip
Qt-5a44a309ff4d888c57a5648198be6996cdef4c80.tar.gz
Qt-5a44a309ff4d888c57a5648198be6996cdef4c80.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxmouseregion.cpp')
-rw-r--r--src/declarative/fx/qfxmouseregion.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp
index 88a5c36..c0314f1 100644
--- a/src/declarative/fx/qfxmouseregion.cpp
+++ b/src/declarative/fx/qfxmouseregion.cpp
@@ -481,8 +481,8 @@ void QFxMouseRegion::timerEvent(QTimerEvent *event)
\qmlproperty bool MouseRegion::containsMouse
This property holds whether the mouse is currently inside the mouse region.
- \warning This property is only partially implemented -- it is only valid when the mouse is moved over the
- region. If the region moves under the mouse, \e containsMouse will not change.
+ \warning This property is not updated if the region moves under the mouse: \e containsMouse will not change.
+ In addition, if hoverEnabled is false, containsMouse will only be valid when the mouse is pressed.
*/
bool QFxMouseRegion::hovered() const
{