summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows/qwindowssystemtrayicon.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-13 01:00:21 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-13 01:00:33 +0200
commita837ec15fec100567730a7bedb06655ef891ac96 (patch)
tree26145ff431143f837f4d0eb77e7fc15df775a26c /src/plugins/platforms/windows/qwindowssystemtrayicon.cpp
parent38c2b80e65b66f8f85ad177307277107d63d9b50 (diff)
parenta3d1fee81bc263ecf240c9ea48ce7c9bade20abd (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/plugins/platforms/windows/qwindowssystemtrayicon.cpp')
0 files changed, 0 insertions, 0 deletions