summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qstandardgestures.cpp
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-06-07 16:10:46 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-06-07 16:10:46 (GMT)
commitd26856959f5031c03ed245df5aa9cb3b15a0596b (patch)
tree8484a674a9acb81d18c5a01ef9f2445c2a2a81b0 /src/gui/kernel/qstandardgestures.cpp
parent0c0f22ec0e36d7001c8195dcc6e390a37118e33e (diff)
parentbf966d125d5c5fa7719ae9f9110db8742d5a4c85 (diff)
downloadQt-d26856959f5031c03ed245df5aa9cb3b15a0596b.zip
Qt-d26856959f5031c03ed245df5aa9cb3b15a0596b.tar.gz
Qt-d26856959f5031c03ed245df5aa9cb3b15a0596b.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-staging1
Diffstat (limited to 'src/gui/kernel/qstandardgestures.cpp')
-rw-r--r--src/gui/kernel/qstandardgestures.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qstandardgestures.cpp b/src/gui/kernel/qstandardgestures.cpp
index bfcfa86..8a3e89e 100644
--- a/src/gui/kernel/qstandardgestures.cpp
+++ b/src/gui/kernel/qstandardgestures.cpp
@@ -47,6 +47,8 @@
#include "qabstractscrollarea.h"
#include "qdebug.h"
+#ifndef QT_NO_GESTURES
+
QT_BEGIN_NAMESPACE
QPanGestureRecognizer::QPanGestureRecognizer()
@@ -566,3 +568,5 @@ void QTapAndHoldGestureRecognizer::reset(QGesture *state)
}
QT_END_NAMESPACE
+
+#endif // QT_NO_GESTURES