diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-04 10:21:19 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-04 10:21:19 +0100 |
| commit | 3432dd2a5ffb19144dae39cb1c728b44a48f04f5 (patch) | |
| tree | b10e9c9e52e7babaf09f96501ba7caf0506a4fb5 /src/extras/qmldir | |
| parent | 13b04b0b9f30035847bb2295a128c2c9746e9d99 (diff) | |
| parent | cdbe52a8f511e28ec0256c242d93f025fd21c55b (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: Ide73d291e885a0455765263716ea2b972d7ae62b
Diffstat (limited to 'src/extras/qmldir')
0 files changed, 0 insertions, 0 deletions