diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-23 11:16:23 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-23 09:33:53 +0000 |
commit | 2f24150b03a8141b3e64442bcfcc08448b9a79e5 (patch) | |
tree | d742b17e50d24b82f7e5e58a04abf6c7a73cb4c2 /src/quick/items/qquickitem.cpp | |
parent | c8c2db3f5b157131542025ce556d248c7a916a00 (diff) |
Add a feature for Drag&Drop support in Qt Quick
Even if we have drag&drop in QtGui we don't necessarily want it in
QtQuick. Also, since the QQuickDropArea needs QRegularExpression,
quick-draganddrop needs to depend on regularexpression.
Change-Id: I623e910178160ad3e3af3c01c96c30e88dc1b7ba
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
-rw-r--r-- | src/quick/items/qquickitem.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index e114404524..52a1d59e77 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -4163,7 +4163,7 @@ void QQuickItem::hoverLeaveEvent(QHoverEvent *event) Q_UNUSED(event); } -#if QT_CONFIG(draganddrop) +#if QT_CONFIG(quick_draganddrop) /*! This event handler can be reimplemented in a subclass to receive drag-enter events for an item. The event information is provided by the @@ -4231,7 +4231,7 @@ void QQuickItem::dropEvent(QDropEvent *event) { Q_UNUSED(event); } -#endif // draganddrop +#endif // quick_draganddrop /*! Reimplement this method to filter the mouse events that are received by @@ -8118,7 +8118,7 @@ bool QQuickItem::event(QEvent *ev) wheelEvent(static_cast<QWheelEvent*>(ev)); break; #endif -#if QT_CONFIG(draganddrop) +#if QT_CONFIG(quick_draganddrop) case QEvent::DragEnter: dragEnterEvent(static_cast<QDragEnterEvent*>(ev)); break; @@ -8131,7 +8131,7 @@ bool QQuickItem::event(QEvent *ev) case QEvent::Drop: dropEvent(static_cast<QDropEvent*>(ev)); break; -#endif // draganddrop +#endif // quick_draganddrop #if QT_CONFIG(gestures) case QEvent::NativeGesture: ev->ignore(); |