diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-06-20 10:31:52 +0900 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-24 20:36:11 +0200 |
| commit | 010398c9b013fdad0580fcebd61c42aa73a6b346 (patch) | |
| tree | 98da96fc2ebc8c4e7f00fc71b8a884497dd868a0 /src/quick/items/qquickcanvas.cpp | |
| parent | b970267ea4c182b4627e95024d7b4891141019ed (diff) | |
Make qtdeclarative compile with QT_NO_DRAGANDDROP
Change-Id: Ie92455495979b065b574f013d95fac17739fa40e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
Diffstat (limited to 'src/quick/items/qquickcanvas.cpp')
| -rw-r--r-- | src/quick/items/qquickcanvas.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp index 82fabd047b..7c59a9df9e 100644 --- a/src/quick/items/qquickcanvas.cpp +++ b/src/quick/items/qquickcanvas.cpp @@ -1062,12 +1062,14 @@ bool QQuickCanvas::event(QEvent *e) d->clearHover(); d->lastMousePosition = QPoint(); break; +#ifndef QT_NO_DRAGANDDROP case QEvent::DragEnter: case QEvent::DragLeave: case QEvent::DragMove: case QEvent::Drop: d->deliverDragEvent(&d->dragGrabber, e); break; +#endif case QEvent::WindowDeactivate: rootItem()->windowDeactivateEvent(); break; @@ -1578,6 +1580,7 @@ bool QQuickCanvasPrivate::deliverTouchPoints(QQuickItem *item, QTouchEvent *even return false; } +#ifndef QT_NO_DRAGANDDROP void QQuickCanvasPrivate::deliverDragEvent(QQuickDragGrabber *grabber, QEvent *event) { Q_Q(QQuickCanvas); @@ -1697,6 +1700,7 @@ bool QQuickCanvasPrivate::deliverDragEvent(QQuickDragGrabber *grabber, QQuickIte return accepted; } +#endif // QT_NO_DRAGANDDROP bool QQuickCanvasPrivate::sendFilteredMouseEvent(QQuickItem *target, QQuickItem *item, QEvent *event) { @@ -1792,12 +1796,14 @@ bool QQuickCanvas::sendEvent(QQuickItem *item, QEvent *e) QQuickItemPrivate::get(item)->deliverTouchEvent(static_cast<QTouchEvent *>(e)); } break; +#ifndef QT_NO_DRAGANDDROP case QEvent::DragEnter: case QEvent::DragMove: case QEvent::DragLeave: case QEvent::Drop: QQuickItemPrivate::get(item)->deliverDragEvent(e); break; +#endif default: break; } |