diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-29 00:32:25 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-29 00:32:25 (GMT) |
| commit | a7ace40338145184ca490d1544c1171b56852617 (patch) | |
| tree | 5ac30db7f42f5b706d1de2f645783a8e8c7805a7 /src/declarative/graphicsitems/qdeclarativeevents.cpp | |
| parent | 44708167042e95ab4b5cfef8a19a9ab4f9484a71 (diff) | |
| parent | efab34ea95560db007b1a75cce63cf8f6431a683 (diff) | |
| download | Qt-a7ace40338145184ca490d1544c1171b56852617.zip Qt-a7ace40338145184ca490d1544c1171b56852617.tar.gz Qt-a7ace40338145184ca490d1544c1171b56852617.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeevents.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeevents.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeevents.cpp b/src/declarative/graphicsitems/qdeclarativeevents.cpp index 4425c97..81ec6e1 100644 --- a/src/declarative/graphicsitems/qdeclarativeevents.cpp +++ b/src/declarative/graphicsitems/qdeclarativeevents.cpp @@ -151,7 +151,7 @@ Item { \list \o Qt.LeftButton \o Qt.RightButton - \o Qt.MidButton + \o Qt.MiddleButton \endlist */ @@ -174,7 +174,7 @@ Item { \list \o Qt.LeftButton \o Qt.RightButton - \o Qt.MidButton + \o Qt.MiddleButton \endlist */ |