diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-12-16 15:48:04 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-23 18:49:08 +0000 |
| commit | 7bebdb472a396bad05c9448e7b5d86fceb0fbe33 (patch) | |
| tree | 9f5a503ef74fdaba78fc205fb4902d42e5a1d928 /src/gui | |
| parent | 34e4a8ef6d20e829a322bfef1d09136a37fecfd2 (diff) | |
QDrag: mark QDrag::start() as deprecated
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 <aha_1980@gmx.de>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qdrag.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qdrag.h | 3 |
2 files changed, 5 insertions, 0 deletions
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); |