diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-03-24 14:36:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-03-24 14:36:02 +0100 |
| commit | 576dc2c7010904b2ace4cdd7284599d696832186 (patch) | |
| tree | 839f30eff1d150f3e0228fe1f4145986cf2eebe0 /src/plugins/platforms/xcb/qxcbatom.h | |
| parent | 6a972f44f3f88d6179e8e4eef54396b5808b3f4d (diff) | |
| parent | cc1d891b8ed1c4f23183e4b06f46e5840a993e35 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/plugins/platforms/xcb/qxcbdrag.cpp
Change-Id: I0b47324b70b0b4894e54b21aa3e7a5041f9bd5e3
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbatom.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbatom.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbatom.h b/src/plugins/platforms/xcb/qxcbatom.h index 80b5887395..9cf93ec314 100644 --- a/src/plugins/platforms/xcb/qxcbatom.h +++ b/src/plugins/platforms/xcb/qxcbatom.h @@ -183,6 +183,7 @@ public: XdndActionCopy, XdndActionLink, XdndActionMove, + XdndActionAsk, XdndActionPrivate, // Xkb |