summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows/qwindowsintegration.cpp
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2016-07-28 08:09:22 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-07-28 08:09:22 +0000
commit80c23042e4137dc21d92eab4db00e22f2446269b (patch)
tree306790e20b1e057e832200772857070ddacd23a0 /src/plugins/platforms/windows/qwindowsintegration.cpp
parent69b43e74d78e050cf5e40197acafa4bc9f90c0bd (diff)
parent6c5de416c9e77433b20b95621c75666a47fbffbd (diff)
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsintegration.cpp')
0 files changed, 0 insertions, 0 deletions