summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb/qxcbintegration.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-02-28 10:32:56 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-02-28 10:32:56 +0100
commit96ffe48add521e29d883814a35b1130b9dfdd636 (patch)
treed0ae779efa69ecb8c39999786af22152db902806 /src/plugins/platforms/xcb/qxcbintegration.cpp
parent37217c57fa5595e7cdfd7e19f34de22848dfc370 (diff)
parenteba652a99f602386127e552740fddf5445b3d7c9 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbintegration.cpp')
0 files changed, 0 insertions, 0 deletions