diff --git a/src/widgets/dialogs/qsidebar.cpp b/src/widgets/dialogs/qsidebar.cpp index eaaceae1252..9dcc6e35ff5 100644 --- a/src/widgets/dialogs/qsidebar.cpp +++ b/src/widgets/dialogs/qsidebar.cpp @@ -51,10 +51,12 @@ QUrlModel::~QUrlModel() constexpr char uriListMimeType[] = "text/uri-list"; +#if QT_CONFIG(draganddrop) static bool hasSupportedFormat(const QMimeData *data) { return data->hasFormat(QLatin1StringView(uriListMimeType)); } +#endif // QT_CONFIG(draganddrop) /*! \reimp diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp index bffc1eadb6b..ecf70fec054 100644 --- a/src/widgets/itemviews/qlistwidget.cpp +++ b/src/widgets/itemviews/qlistwidget.cpp @@ -429,13 +429,14 @@ Qt::DropActions QListModel::supportedDropActions() const { return view()->supportedDropActions(); } -#endif // QT_CONFIG(draganddrop) Qt::DropActions QListModel::supportedDragActions() const { return view()->supportedDragActions(); } +#endif // QT_CONFIG(draganddrop) + /*! \class QListWidgetItem \brief The QListWidgetItem class provides an item for use with the @@ -1804,6 +1805,7 @@ QMimeData *QListWidget::mimeData(const QList &items) const } #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 @@ -1841,7 +1843,6 @@ Qt::DropActions QListWidget::supportedDropActions() const Q_D(const QListWidget); return d->listModel()->QAbstractListModel::supportedDropActions() | Qt::MoveAction; } -#endif // QT_CONFIG(draganddrop) /*! Returns the drag actions supported by this view. @@ -1868,6 +1869,8 @@ void QListWidget::setSupportedDragActions(Qt::DropActions actions) d->supportedDragActions = actions; } +#endif // QT_CONFIG(draganddrop) + /*! Returns a list of pointers to the items contained in the \a data object. If the object was not created by a QListWidget in the same process, the list diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index ef2dcfb21eb..167d51c7905 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -221,9 +221,10 @@ public: QModelIndex indexFromItem(const QListWidgetItem *item) const; QListWidgetItem *itemFromIndex(const QModelIndex &index) const; +#if QT_CONFIG(draganddrop) void setSupportedDragActions(Qt::DropActions actions); Qt::DropActions supportedDragActions() const; - +#endif protected: #if QT_CONFIG(draganddrop) void dropEvent(QDropEvent *event) override; diff --git a/src/widgets/itemviews/qlistwidget_p.h b/src/widgets/itemviews/qlistwidget_p.h index acd48ed5602..fad71def1ac 100644 --- a/src/widgets/itemviews/qlistwidget_p.h +++ b/src/widgets/itemviews/qlistwidget_p.h @@ -97,9 +97,8 @@ public: bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; Qt::DropActions supportedDropActions() const override; -#endif Qt::DropActions supportedDragActions() const override; - +#endif QMimeData *internalMimeData() const; private: QList items; diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp index 66fdcf20d78..d6993ca453c 100644 --- a/src/widgets/widgets/qtoolbar.cpp +++ b/src/widgets/widgets/qtoolbar.cpp @@ -115,6 +115,8 @@ void QToolBarPrivate::updateWindowFlags(bool floating, bool unplug) // the platform window when it would be removed later if (unplug && !QMainWindowLayout::needsPlatformDrag()) flags |= Qt::X11BypassWindowManagerHint; +#else + Q_UNUSED(unplug); #endif q->setWindowFlags(flags);