diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-10 01:00:21 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-10 01:00:21 +0200 |
commit | 1bddf29287b4c42c321688376147d14bfecb46a1 (patch) | |
tree | 2939d848a3a5496963aa2749b9deead6df9c49f4 /src/qml/parser/qqmljs.g | |
parent | a02b5d48cf63228ed8faf6abf4724df2c4500269 (diff) | |
parent | 3fde977a817498817e98ce350d493658b0ed4458 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I2835748c27616103f275849141fbe5a93e3dfd8c
Diffstat (limited to 'src/qml/parser/qqmljs.g')
0 files changed, 0 insertions, 0 deletions