summaryrefslogtreecommitdiff
path: root/src/script/bridge/qscriptdeclarativeclass.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-14 03:00:48 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-14 03:00:48 +0100
commit2868ff088ac35f0f8fe8e052669bf251e366e416 (patch)
tree9f328838228a5f314177e9a7c812a9efb0bbba6a /src/script/bridge/qscriptdeclarativeclass.cpp
parentee32a6b5a0ba187606b9ad3cdfcf73cbbc1ce02f (diff)
parent958152b5dabb5fdd370869f49d0d45804b16e399 (diff)
downloadqtscript-2868ff088ac35f0f8fe8e052669bf251e366e416.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I96856187418295b7b5ecc0bd9a66aaee650dcef2
Diffstat (limited to 'src/script/bridge/qscriptdeclarativeclass.cpp')
0 files changed, 0 insertions, 0 deletions