diff options
author | Rick Stockton <rickstockton@reno-computerhelp.com> | 2012-03-19 22:10:36 (GMT) |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 05:44:38 (GMT) |
commit | 2404eb37bc8df5e375ca09362cc7fd3f5fdbc99d (patch) | |
tree | 2e4b6bf93460e2db8a48b7aa5d045c49114068de /src/declarative | |
parent | bfbfbb8ae1a52de8ebe4d718fe1dd2e2234b8c89 (diff) | |
download | Qt-2404eb37bc8df5e375ca09362cc7fd3f5fdbc99d.zip Qt-2404eb37bc8df5e375ca09362cc7fd3f5fdbc99d.tar.gz Qt-2404eb37bc8df5e375ca09362cc7fd3f5fdbc99d.tar.bz2 |
Doc Fix- a QML MouseArea Elelment can accept 5 buttons.
Add XButton1 AND Xbutton2 to the list of accepted Buttons.
This is only a doco fix, without any code change.
On branch 4.8
Change-Id: Ib396ec7707a63123759f1164927f0b63850cebe9
Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/declarative')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativemousearea.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp index 3651180..c653893 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp +++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp @@ -886,6 +886,8 @@ void QDeclarativeMouseArea::setHovered(bool h) \o Qt.LeftButton \o Qt.RightButton \o Qt.MiddleButton + \o Qt.XButton1 + \o Qt.XButton2 \endlist To accept more than one button the flags can be combined with the |