diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-10 21:10:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-10 22:35:04 +0100 |
| commit | 364b161122b567e3a6f7343d438fb540b9fb7e5c (patch) | |
| tree | 3d49953be9a58295a8c956cf5fdb00f581020605 /src/gui/kernel/qdrag.cpp | |
| parent | e58401a75b29beb38d37a40072106d5ef7cb0336 (diff) | |
| parent | 8a410f60ae39b06555d807581caf7cb8bfab4fac (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmainwindowlayout_p.h
Change-Id: Id406a67606b885052ed405b0fbc8eea7d9d03224
Diffstat (limited to 'src/gui/kernel/qdrag.cpp')
| -rw-r--r-- | src/gui/kernel/qdrag.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp index 5b36f496f1..0aadac2c62 100644 --- a/src/gui/kernel/qdrag.cpp +++ b/src/gui/kernel/qdrag.cpp @@ -393,7 +393,7 @@ Qt::DropAction QDrag::defaultAction() const \note This is currently implemented on Windows and X11. - \since 5.6 + \since 5.7 \sa exec() */ void QDrag::cancel() |