From 7bebdb472a396bad05c9448e7b5d86fceb0fbe33 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sun, 16 Dec 2018 15:48:04 +0100 Subject: QDrag: mark QDrag::start() as deprecated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QDrag::start() is deprecated since Qt4. Therefore annotate it with Q_DEPRECATED so it can be removed in Qt6. Change-Id: I5b82c482fa579f357cc67e38b86e6fe587f18ded Reviewed-by: André Hartmann Reviewed-by: Friedemann Kleint Reviewed-by: Richard Moe Gustavsen --- src/gui/kernel/qdrag.cpp | 2 ++ src/gui/kernel/qdrag.h | 3 +++ 2 files changed, 5 insertions(+) (limited to 'src/gui') diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp index bb0e490aa0..dcd0d13d5c 100644 --- a/src/gui/kernel/qdrag.cpp +++ b/src/gui/kernel/qdrag.cpp @@ -284,6 +284,7 @@ Qt::DropAction QDrag::exec(Qt::DropActions supportedActions, Qt::DropAction defa return d->executed_action; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -311,6 +312,7 @@ Qt::DropAction QDrag::start(Qt::DropActions request) d->executed_action = QDragManager::self()->drag(this); return d->executed_action; } +#endif /*! Sets the drag \a cursor for the \a action. This allows you diff --git a/src/gui/kernel/qdrag.h b/src/gui/kernel/qdrag.h index 27b9c2c88f..7acd5088bd 100644 --- a/src/gui/kernel/qdrag.h +++ b/src/gui/kernel/qdrag.h @@ -74,7 +74,10 @@ public: QObject *source() const; QObject *target() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QDrag::exec() instead") Qt::DropAction start(Qt::DropActions supportedActions = Qt::CopyAction); +#endif Qt::DropAction exec(Qt::DropActions supportedActions = Qt::MoveAction); Qt::DropAction exec(Qt::DropActions supportedActions, Qt::DropAction defaultAction); -- cgit v1.2.3