diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-14 10:49:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-14 10:52:24 +0100 |
| commit | 0c034a649f61019c16aba479fe79d20dde41f2f2 (patch) | |
| tree | 54545862591044b65e618989805945bceb0b3ea5 /src/widgets/itemviews/qlistwidget.h | |
| parent | 2162f01111d21d0ce66ceb8be290b0a13653e691 (diff) | |
| parent | df40b1115db600e8de1c4774476fa30956a34fd9 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qpushbutton.cpp
Change-Id: I615de00e6e64540c50f658d4d8ab3e002d701a81
Diffstat (limited to 'src/widgets/itemviews/qlistwidget.h')
| -rw-r--r-- | src/widgets/itemviews/qlistwidget.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index c70e0522b7..85ca639e50 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -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(); |