diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-02 09:39:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-02 09:39:31 +0200 |
| commit | 166889ddcbaac91c403a840f138f25bc2907b68c (patch) | |
| tree | e30d875586d782d2253b18c63e9829f246356665 /src/corelib/kernel/qcoreapplication.cpp | |
| parent | ef05c48898e90e4ff40d8c4493f4b80bc22c1703 (diff) | |
| parent | ef3daddae1720956e746142ac7ee54a27b9299d7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/corelib/kernel/qobject.cpp
Change-Id: I8ca1163a1fa8072dcd16ea4426c58219149599fd
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
0 files changed, 0 insertions, 0 deletions