summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-03-22 01:17:36 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-03-22 01:17:36 (GMT)
commit897ecf7dab2a34dbf3abf5167dc19a405f65a112 (patch)
treebbf81234c7aca8353d496fc92a5f93e8280733ad /src/corelib/global
parent71be51f256edbac81966e1d65ef6f774f5fa17e9 (diff)
downloadQt-897ecf7dab2a34dbf3abf5167dc19a405f65a112.zip
Qt-897ecf7dab2a34dbf3abf5167dc19a405f65a112.tar.gz
Qt-897ecf7dab2a34dbf3abf5167dc19a405f65a112.tar.bz2
Add MiddleButton = MidButton to MouseButtons enum.
Task-number: QTBUG-6617 Reviewed-by: Alexis Menard
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qnamespace.h3
-rw-r--r--src/corelib/global/qnamespace.qdoc1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 89a0c0b..1ef875f 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -146,7 +146,8 @@ public:
NoButton = 0x00000000,
LeftButton = 0x00000001,
RightButton = 0x00000002,
- MidButton = 0x00000004,
+ MidButton = 0x00000004, // ### Qt 5: remove me
+ MiddleButton = MidButton,
XButton1 = 0x00000008,
XButton2 = 0x00000010,
MouseButtonMask = 0x000000ff
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index f8f3c49..8f9902f 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -185,6 +185,7 @@
left-handed mice.)
\value RightButton The right button.
\value MidButton The middle button.
+ \value MiddleButton The middle button.
\value XButton1 The first X button.
\value XButton2 The second X button.