diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:30:27 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:30:27 +0100 |
| commit | f9bf92a6e8e552885bcb2e5f05579a5e224252ae (patch) | |
| tree | b33212fd75467a81718deb3ee480a2a0106dbc24 /src/remoteobjects/qremoteobjectnode.cpp | |
| parent | ac6b0b0d1ca9fe3f6a61e078db9a30eb5dad6da0 (diff) | |
| parent | 6d9f5fc21cb272aad6c04b734f52c499e7e9e952 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
.qmake.conf
Change-Id: I5f4066a5a20c5b449efc2ed7a246535082a56e8b
Diffstat (limited to 'src/remoteobjects/qremoteobjectnode.cpp')
0 files changed, 0 insertions, 0 deletions