summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qplatformwindow.cpp
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2017-02-09 04:11:53 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2017-02-09 04:11:53 +0000
commitc1e7d0795b1cc5b5b6a6ee0030f550f6e0f80e5c (patch)
tree7991f99861cad1d1e43bc2e670c3ef6fb0328e32 /src/gui/kernel/qplatformwindow.cpp
parent8deeb6777dc2744a6b8e0c374f92ddcc8c004827 (diff)
parentdd756011da13b95fdb630a1bbb90234f1e60f415 (diff)
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
Diffstat (limited to 'src/gui/kernel/qplatformwindow.cpp')
0 files changed, 0 insertions, 0 deletions