diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-04 16:37:58 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-04 16:37:58 (GMT) |
| commit | bc5ff9a1fc9982d8669324fde2103dd447486860 (patch) | |
| tree | c6d2dec1e4a083e7128a3e6bd4fdb5be28290da6 /src/gui/statemachine/qbasicmouseeventtransition_p.h | |
| parent | 9a88c8808f8e084e77ee22f907366250f3a0ad2a (diff) | |
| parent | 56b8d24c337d30c6bcdda101fbc664c4fd6d642d (diff) | |
| download | Qt-bc5ff9a1fc9982d8669324fde2103dd447486860.zip Qt-bc5ff9a1fc9982d8669324fde2103dd447486860.tar.gz Qt-bc5ff9a1fc9982d8669324fde2103dd447486860.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'src/gui/statemachine/qbasicmouseeventtransition_p.h')
| -rw-r--r-- | src/gui/statemachine/qbasicmouseeventtransition_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/statemachine/qbasicmouseeventtransition_p.h b/src/gui/statemachine/qbasicmouseeventtransition_p.h index 512e0f8..6754c55 100644 --- a/src/gui/statemachine/qbasicmouseeventtransition_p.h +++ b/src/gui/statemachine/qbasicmouseeventtransition_p.h @@ -79,11 +79,11 @@ public: Qt::MouseButton button() const; void setButton(Qt::MouseButton button); - Qt::KeyboardModifiers modifiersMask() const; - void setModifiersMask(Qt::KeyboardModifiers modifiers); + Qt::KeyboardModifiers modifierMask() const; + void setModifierMask(Qt::KeyboardModifiers modifiers); - QPainterPath path() const; - void setPath(const QPainterPath &path); + QPainterPath hitTestPath() const; + void setHitTestPath(const QPainterPath &path); protected: bool eventTest(QEvent *event); |