summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qnamespace.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-06 01:00:58 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2020-02-06 11:38:18 +0100
commitd37f58e75b7d484ea8fde64dbf13e901d83a078f (patch)
treebad5b491b96b92ae52c27e38bd30466b7d55423c /src/corelib/global/qnamespace.h
parent8c6c4df3e83776d821f357582a717dbfbeb1c3ff (diff)
parent8ce0ad805d59da7be377233874a2783303f381f8 (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/corelib/global/qnamespace.h')
0 files changed, 0 insertions, 0 deletions