diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-11 01:00:08 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-11 10:29:12 +0100 |
| commit | 54cbf2539561bb11d8c38fbb6284a58bcb76b494 (patch) | |
| tree | bae1c62c47664102ac64f94a3faa3e1c80be4f01 /src/qml/jsapi | |
| parent | 02f9934f4dbb99932e3879d5a6a2ecfa96958f71 (diff) | |
| parent | 8b709c0779ffd6d6d9fa9322e7cff46f51076848 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.pro
Change-Id: I07d8cd0becb35caa9c4dbd2c3067403b3726202d
Diffstat (limited to 'src/qml/jsapi')
0 files changed, 0 insertions, 0 deletions