diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-26 01:00:07 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-26 01:00:08 +0100 |
commit | 226533fd85f8c2a2a8ac1f4abde4a34cb2221f75 (patch) | |
tree | 867f6528fa68e20ce8c4cdb83e7637eb772fd123 /src/corelib/kernel/qobject_p.h | |
parent | 462c2745a5168a5b57381d05779b5d16aebe018e (diff) | |
parent | 3c4078ca02cc438dbe668c4a3819d54134ac75b5 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Iad459349ea8b4090d79b4771bfff8f656a8a8189
Diffstat (limited to 'src/corelib/kernel/qobject_p.h')
0 files changed, 0 insertions, 0 deletions