diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-02 11:54:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-02 11:54:15 (GMT) |
| commit | b956e12165beb11e92f3d9b65aa488cd120ec6c8 (patch) | |
| tree | a200e811d590ecc4cc169ef65da9d9dcc9e1f1b7 /src/gui/kernel/qstandardgestures_p.h | |
| parent | 0fd09af3a05ac88c55fed73c85dc1c5aba68f057 (diff) | |
| parent | dad9f0db9dbde73aeaccc4f5d27def15066cd618 (diff) | |
| download | Qt-b956e12165beb11e92f3d9b65aa488cd120ec6c8.zip Qt-b956e12165beb11e92f3d9b65aa488cd120ec6c8.tar.gz Qt-b956e12165beb11e92f3d9b65aa488cd120ec6c8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix compilation on WinXP MinGW32;
Add a new qconfig feature GESTURES
Diffstat (limited to 'src/gui/kernel/qstandardgestures_p.h')
| -rw-r--r-- | src/gui/kernel/qstandardgestures_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qstandardgestures_p.h b/src/gui/kernel/qstandardgestures_p.h index 64505d8..da73b85 100644 --- a/src/gui/kernel/qstandardgestures_p.h +++ b/src/gui/kernel/qstandardgestures_p.h @@ -56,6 +56,8 @@ #include "qgesturerecognizer.h" #include "private/qgesture_p.h" +#ifndef QT_NO_GESTURES + QT_BEGIN_NAMESPACE class QPanGestureRecognizer : public QGestureRecognizer @@ -110,4 +112,6 @@ public: QT_END_NAMESPACE +#endif // QT_NO_GESTURES + #endif // QSTANDARDGESTURES_P_H |