summaryrefslogtreecommitdiff
path: root/src/script/api/qscriptcontext.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-13 12:47:57 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-13 12:47:57 +0100
commitff72f3f48d35f2860cd0f6bd43c3fa70252dacf1 (patch)
tree397d6fd081b0955f8c25a7b7b27f22e10d91e53c /src/script/api/qscriptcontext.cpp
parent359185dae19473c5ec39ba675424506b9d34d815 (diff)
parent286286f9750a6417b00877c84cf73fc61002c139 (diff)
downloadqtscript-ff72f3f48d35f2860cd0f6bd43c3fa70252dacf1.tar.gz
Merge remote-tracking branch 'origin/5.14.0' into 5.14
Change-Id: I71405635c337f074ddd3eedc3b3bb3398ba719fb
Diffstat (limited to 'src/script/api/qscriptcontext.cpp')
0 files changed, 0 insertions, 0 deletions