diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-04-13 09:01:43 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-05-29 18:31:35 +0000 |
commit | 9f27bfb31acfba49a74a342d9249f24633a7ade2 (patch) | |
tree | b156192def25d688ff924b60f1c8defadd86c351 /src/widgets/itemviews/qlistwidget.cpp | |
parent | dd8e73504edbf71808d6585b7a08daddcdcbf18e (diff) |
Make sure we can build with -no-feature-draganddrop
We move QInternalMimeData to a separate file, because this class is
used, even if draganddrop is disabled. From now on, include
qinternalmimedata_p.h instead of qdnd_p.h for QInternalMimeData.
Change-Id: I594e08e2e90d574dc445119091686b4b69e4731b
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'src/widgets/itemviews/qlistwidget.cpp')
-rw-r--r-- | src/widgets/itemviews/qlistwidget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp index 1fedad80aa..4f1c7fe80a 100644 --- a/src/widgets/itemviews/qlistwidget.cpp +++ b/src/widgets/itemviews/qlistwidget.cpp @@ -444,7 +444,7 @@ QMimeData *QListModel::mimeData(const QModelIndexList &indexes) const return mimeData; } -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) bool QListModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &index) { @@ -463,7 +463,7 @@ Qt::DropActions QListModel::supportedDropActions() const const QListWidget *view = qobject_cast<const QListWidget*>(QObject::parent()); return view->supportedDropActions(); } -#endif // QT_NO_DRAGANDDROP +#endif // QT_CONFIG(draganddrop) /*! \class QListWidgetItem @@ -1859,7 +1859,7 @@ QMimeData *QListWidget::mimeData(const QList<QListWidgetItem*> items) const return d->listModel()->internalMimeData(); } -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) /*! Handles \a data supplied by an external drag and drop operation that ended with the given \a action in the given \a index. Returns \c true if \a data and @@ -1934,7 +1934,7 @@ Qt::DropActions QListWidget::supportedDropActions() const Q_D(const QListWidget); return d->listModel()->QAbstractListModel::supportedDropActions() | Qt::MoveAction; } -#endif // QT_NO_DRAGANDDROP +#endif // QT_CONFIG(draganddrop) /*! Returns a list of pointers to the items contained in the \a data object. If |