Fix build with -no-feature-draganddrop
Change-Id: If537cb6b7d41b2d6511c369451dde2e9289f724d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
parent
410d9cabb7
commit
a16b6e29e0
@ -2996,12 +2996,12 @@ void QGraphicsView::contextMenuEvent(QContextMenuEvent *event)
|
||||
}
|
||||
#endif // QT_NO_CONTEXTMENU
|
||||
|
||||
#if QT_CONFIG(draganddrop)
|
||||
/*!
|
||||
\reimp
|
||||
*/
|
||||
void QGraphicsView::dropEvent(QDropEvent *event)
|
||||
{
|
||||
#ifndef QT_NO_DRAGANDDROP
|
||||
Q_D(QGraphicsView);
|
||||
if (!d->scene || !d->sceneInteractionAllowed)
|
||||
return;
|
||||
@ -3020,10 +3020,6 @@ void QGraphicsView::dropEvent(QDropEvent *event)
|
||||
|
||||
delete d->lastDragDropEvent;
|
||||
d->lastDragDropEvent = 0;
|
||||
|
||||
#else
|
||||
Q_UNUSED(event)
|
||||
#endif
|
||||
}
|
||||
|
||||
/*!
|
||||
@ -3031,7 +3027,6 @@ void QGraphicsView::dropEvent(QDropEvent *event)
|
||||
*/
|
||||
void QGraphicsView::dragEnterEvent(QDragEnterEvent *event)
|
||||
{
|
||||
#ifndef QT_NO_DRAGANDDROP
|
||||
Q_D(QGraphicsView);
|
||||
if (!d->scene || !d->sceneInteractionAllowed)
|
||||
return;
|
||||
@ -3054,9 +3049,6 @@ void QGraphicsView::dragEnterEvent(QDragEnterEvent *event)
|
||||
event->setAccepted(true);
|
||||
event->setDropAction(sceneEvent.dropAction());
|
||||
}
|
||||
#else
|
||||
Q_UNUSED(event)
|
||||
#endif
|
||||
}
|
||||
|
||||
/*!
|
||||
@ -3064,7 +3056,6 @@ void QGraphicsView::dragEnterEvent(QDragEnterEvent *event)
|
||||
*/
|
||||
void QGraphicsView::dragLeaveEvent(QDragLeaveEvent *event)
|
||||
{
|
||||
#ifndef QT_NO_DRAGANDDROP
|
||||
Q_D(QGraphicsView);
|
||||
if (!d->scene || !d->sceneInteractionAllowed)
|
||||
return;
|
||||
@ -3094,9 +3085,6 @@ void QGraphicsView::dragLeaveEvent(QDragLeaveEvent *event)
|
||||
// Accept the originating event if the scene accepted the scene event.
|
||||
if (sceneEvent.isAccepted())
|
||||
event->setAccepted(true);
|
||||
#else
|
||||
Q_UNUSED(event)
|
||||
#endif
|
||||
}
|
||||
|
||||
/*!
|
||||
@ -3104,7 +3092,6 @@ void QGraphicsView::dragLeaveEvent(QDragLeaveEvent *event)
|
||||
*/
|
||||
void QGraphicsView::dragMoveEvent(QDragMoveEvent *event)
|
||||
{
|
||||
#ifndef QT_NO_DRAGANDDROP
|
||||
Q_D(QGraphicsView);
|
||||
if (!d->scene || !d->sceneInteractionAllowed)
|
||||
return;
|
||||
@ -3123,10 +3110,8 @@ void QGraphicsView::dragMoveEvent(QDragMoveEvent *event)
|
||||
event->setAccepted(sceneEvent.isAccepted());
|
||||
if (sceneEvent.isAccepted())
|
||||
event->setDropAction(sceneEvent.dropAction());
|
||||
#else
|
||||
Q_UNUSED(event)
|
||||
#endif
|
||||
}
|
||||
#endif // QT_CONFIG(draganddrop)
|
||||
|
||||
/*!
|
||||
\reimp
|
||||
|
@ -244,10 +244,12 @@ protected:
|
||||
#ifndef QT_NO_CONTEXTMENU
|
||||
void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE;
|
||||
#endif
|
||||
#if QT_CONFIG(draganddrop)
|
||||
void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE;
|
||||
void dragLeaveEvent(QDragLeaveEvent *event) Q_DECL_OVERRIDE;
|
||||
void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE;
|
||||
void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
|
||||
#endif
|
||||
void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE;
|
||||
bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE;
|
||||
void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE;
|
||||
|
@ -2020,7 +2020,9 @@ int QCommonListViewBase::horizontalScrollToValue(const int /*index*/, QListView:
|
||||
QListModeViewBase::QListModeViewBase(QListView *q, QListViewPrivate *d)
|
||||
: QCommonListViewBase(q, d)
|
||||
{
|
||||
#if QT_CONFIG(draganddrop)
|
||||
dd->defaultDropAction = Qt::CopyAction;
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef QT_NO_DRAGANDDROP
|
||||
|
@ -252,8 +252,9 @@ public:
|
||||
|
||||
bool isItemHidden(const QListWidgetItem *item) const;
|
||||
void setItemHidden(const QListWidgetItem *item, bool hide);
|
||||
#if QT_CONFIG(draganddrop)
|
||||
void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
|
||||
|
||||
#endif
|
||||
public Q_SLOTS:
|
||||
void scrollToItem(const QListWidgetItem *item, QAbstractItemView::ScrollHint hint = EnsureVisible);
|
||||
void clear();
|
||||
|
@ -331,8 +331,9 @@ protected:
|
||||
|
||||
QModelIndex indexFromItem(QTableWidgetItem *item) const;
|
||||
QTableWidgetItem *itemFromIndex(const QModelIndex &index) const;
|
||||
#if QT_CONFIG(draganddrop)
|
||||
void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
|
||||
|
||||
#endif
|
||||
private:
|
||||
void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE;
|
||||
|
||||
|
@ -360,8 +360,9 @@ protected:
|
||||
QModelIndex indexFromItem(const QTreeWidgetItem *item, int column = 0) const;
|
||||
QModelIndex indexFromItem(QTreeWidgetItem *item, int column = 0) const; // ### Qt 6: remove
|
||||
QTreeWidgetItem *itemFromIndex(const QModelIndex &index) const;
|
||||
#if QT_CONFIG(draganddrop)
|
||||
void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
|
||||
|
||||
#endif
|
||||
private:
|
||||
void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user