diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-18 03:11:11 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-18 03:11:11 (GMT) |
| commit | 0b8ae4978c460e75e5c96937ada2341fceac2ee2 (patch) | |
| tree | 6e2d4e866d96f9d2446028a3646d9c67b6126b95 /src/imports | |
| parent | 300a259e13906e8dde204e3f33dab88ea80f8302 (diff) | |
| parent | c68c518d0e4823beaab7d3adf20044bc03446b46 (diff) | |
| download | Qt-0b8ae4978c460e75e5c96937ada2341fceac2ee2.zip Qt-0b8ae4978c460e75e5c96937ada2341fceac2ee2.tar.gz Qt-0b8ae4978c460e75e5c96937ada2341fceac2ee2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/gestures/qdeclarativegesturearea.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp index 19afe0c..1b0aeeb 100644 --- a/src/imports/gestures/qdeclarativegesturearea.cpp +++ b/src/imports/gestures/qdeclarativegesturearea.cpp @@ -226,7 +226,7 @@ void QDeclarativeGestureArea::connectSignals() ds >> gesturetype; QString script; ds >> script; - QDeclarativeExpression *exp = new QDeclarativeExpression(qmlContext(this), script, 0); + QDeclarativeExpression *exp = new QDeclarativeExpression(qmlContext(this), 0, script); d->bindings.insert(Qt::GestureType(gesturetype),exp); grabGesture(Qt::GestureType(gesturetype)); } |