summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qplatformdrag.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-13 00:00:35 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2018-12-13 02:30:54 +0000
commit4e2e7078b80dc587414661046a944c97581c1afb (patch)
tree5f470f9c73e581da7ed97d891700f1673937b4c3 /src/gui/kernel/qplatformdrag.h
parentfc2ec95587c431b1916ec5590b7ef634be96c985 (diff)
parentad4f359f805cdb1f1ed4745165090cccfcf11441 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/kernel/qplatformdrag.h')
0 files changed, 0 insertions, 0 deletions