summaryrefslogtreecommitdiff
path: root/src/script/api/qscriptclass.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-11 03:04:32 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-11 03:04:32 +0100
commit90d672d6c72990e5340c2bc3ddcc106c288d0cd8 (patch)
treee498c4b32aab0504d971f8eea5bac34ea506b68f /src/script/api/qscriptclass.cpp
parente3a44489b8ed90ed7f3e231afeaece5ea732ac0f (diff)
parentb9168439a185755ef9110ffb898ab14f4e19cfcb (diff)
downloadqtscript-90d672d6c72990e5340c2bc3ddcc106c288d0cd8.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ib47f269c82616d5fd300d137471b5878ca983341
Diffstat (limited to 'src/script/api/qscriptclass.cpp')
0 files changed, 0 insertions, 0 deletions