--- a/src/imports/gestures/qdeclarativegesturearea.cpp Tue Jul 06 15:10:48 2010 +0300
+++ b/src/imports/gestures/qdeclarativegesturearea.cpp Wed Aug 18 10:37:55 2010 +0300
@@ -55,6 +55,8 @@
#include <private/qobject_p.h>
+#ifndef QT_NO_GESTURES
+
QT_BEGIN_NAMESPACE
class QDeclarativeGestureAreaPrivate : public QDeclarativeItemPrivate
@@ -128,7 +130,7 @@
GestureArea is an invisible item: it is never painted.
- \sa Gesture, MouseArea
+ \sa MouseArea, {declarative/touchinteraction/gestures}{Gestures example}
*/
/*!
@@ -226,7 +228,7 @@
ds >> gesturetype;
QString script;
ds >> script;
- QDeclarativeExpression *exp = new QDeclarativeExpression(qmlContext(this), 0, script);
+ QDeclarativeExpression *exp = new QDeclarativeExpression(qmlContext(this), this, script);
d->bindings.insert(Qt::GestureType(gesturetype),exp);
grabGesture(Qt::GestureType(gesturetype));
}
@@ -259,7 +261,10 @@
bool accept = true;
for (Bindings::Iterator it = bindings.begin(); it != bindings.end(); ++it) {
if ((gesture = event->gesture(it.key()))) {
- it.value()->evaluate();
+ QDeclarativeExpression *expr = it.value();
+ expr->evaluate();
+ if (expr->hasError())
+ qmlInfo(q_func()) << expr->error();
event->setAccepted(true); // XXX only if value returns true?
}
}
@@ -267,3 +272,5 @@
}
QT_END_NAMESPACE
+
+#endif // QT_NO_GESTURES