diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-30 13:47:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-30 13:47:36 +0200 |
| commit | 71ec1d6d79c16c46837dbd10f1cd2a53027a6682 (patch) | |
| tree | 5008d058a0ea3ef379c36ad2364d9b2bc78f3aaf /src/corelib/kernel/qobject.cpp | |
| parent | 31753adebe0f19b90f332e81e1a9b063b40f982d (diff) | |
| parent | 75f51d2f40746205484b969a72a56d75d5d8ff39 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
qmake/generators/win32/mingw_make.cpp
Change-Id: I2f790bc8572bd22fea01edf7ca74595b29f063eb
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
0 files changed, 0 insertions, 0 deletions