summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-01 01:01:20 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-01 11:47:42 +0200
commit8791a8398ac232a8daab98601f1bef88bdf7638f (patch)
tree4be3c8daaff311943215f399ae7300ca4af4f969 /src/corelib/global/qglobal.cpp
parent56f084781e2b8891929eca0070212fd7a32b32fc (diff)
parent4e40c54a3caabb6bced27e18e040ee88b739a3c8 (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
0 files changed, 0 insertions, 0 deletions