diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-01 03:03:31 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-01 03:03:31 +0100 |
commit | fb14e81dbc1d553f9a7eadae6242c1cb73d61cf4 (patch) | |
tree | 32148c56fd57fe7b94ea35fc7043c6bfc57aa78a /src/script/api/qscriptclass.cpp | |
parent | 90d672d6c72990e5340c2bc3ddcc106c288d0cd8 (diff) | |
parent | b44c884590ba27378731957af93aa147d3f93f1d (diff) | |
download | qtscript-fb14e81dbc1d553f9a7eadae6242c1cb73d61cf4.tar.gz |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I4a2dcb9347a0d07246a0070ee982891a82ce2062
Diffstat (limited to 'src/script/api/qscriptclass.cpp')
0 files changed, 0 insertions, 0 deletions