diff options
| author | stockton <rickstockton@reno-computerhelp.com> | 2012-04-29 22:21:43 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-30 09:17:13 +0200 |
| commit | 0ea3a1a9adbb49c1d141ed329a1c215a5ce7f764 (patch) | |
| tree | 30b937424f0da93c41227c040e77d9f5ca6a7fe8 | |
| parent | 897586f025a228543679a92787172786779eb856 (diff) | |
Fix Qt::MouseButton Documentation for Qt::ExtraButton24,
Documentation for the 'more mouse buttons' feature has a Typo on
Qt::ExtraButton24 (is shown as "Qt::ExtraButton44", no value.)
Also, the order of BackButton/Xbutton1/ExtraButton1 causes the
'BackButton' value to be a forward reference to XButton1, which
makes it awkward and hard to understand. Same with ForwardButton/
XButton2/ExtraButton2.
Task-number: QTBUG-25529
Change-Id: I04b76d91d7a2155c1917a809a51700059320f510
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| -rw-r--r-- | src/corelib/global/qnamespace.h | 10 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index c238e9a5f3..50f43e3c78 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -155,12 +155,12 @@ public: RightButton = 0x00000002, MidButton = 0x00000004, // ### Qt 6: remove me MiddleButton = MidButton, - XButton1 = 0x00000008, - BackButton = XButton1, + BackButton = 0x00000008, + XButton1 = BackButton, ExtraButton1 = XButton1, - XButton2 = 0x00000010, - ForwardButton = XButton2, - ExtraButton2 = XButton2, + ForwardButton = 0x00000010, + XButton2 = ForwardButton, + ExtraButton2 = ForwardButton, TaskButton = 0x00000020, ExtraButton3 = TaskButton, ExtraButton4 = 0x00000040, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 76ad61d299..a613eff6b2 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -219,7 +219,7 @@ \value ExtraButton21 The 24th non-wheel Mouse Button. \value ExtraButton22 The 25th non-wheel Mouse Button. \value ExtraButton23 The 26th non-wheel Mouse Button. - \value ExtraButton44 The 27th non-wheel Mouse Button. + \value ExtraButton24 The 27th non-wheel Mouse Button. \omitvalue MaxMouseButton \omitvalue MouseButtonMask |