diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-23 11:26:28 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-07-23 11:26:28 (GMT) |
| commit | 166cdf467fb472ed60b04a9dc0273905ebdb9508 (patch) | |
| tree | 6534406b0c584078f0d5db5d6ada2b7d8c2fdc7d /src/gui | |
| parent | 06384dfe674e021c3e6bb66427b4adef4bceb181 (diff) | |
| parent | 1d5bc6d586445c477823e4f7fe03530634bf869d (diff) | |
| download | Qt-166cdf467fb472ed60b04a9dc0273905ebdb9508.zip Qt-166cdf467fb472ed60b04a9dc0273905ebdb9508.tar.gz Qt-166cdf467fb472ed60b04a9dc0273905ebdb9508.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qgesture.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qgesture.h b/src/gui/kernel/qgesture.h index 8f410b1..dcb0264 100644 --- a/src/gui/kernel/qgesture.h +++ b/src/gui/kernel/qgesture.h @@ -134,6 +134,7 @@ class Q_GUI_EXPORT QPinchGesture : public QGesture { Q_OBJECT Q_DECLARE_PRIVATE(QPinchGesture) + Q_FLAGS(ChangeFlags ChangeFlag) public: enum ChangeFlag { @@ -191,6 +192,8 @@ public: friend class QPinchGestureRecognizer; }; +Q_DECLARE_OPERATORS_FOR_FLAGS(QPinchGesture::ChangeFlags) + QT_END_NAMESPACE Q_DECLARE_METATYPE(QPinchGesture::ChangeFlags) |