aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmlworkerscript/qquickworkerscript.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-05 01:00:07 +0100
committerUlf Hermann <ulf.hermann@qt.io>2019-12-05 10:14:21 +0100
commit79166592d17135309a070065e7cb947ffa293828 (patch)
treea8c7226f81853084c481c4194e47bcdf1e9ab412 /src/qmlworkerscript/qquickworkerscript.cpp
parentab7f591a6b18a0a2a03b760fbd6a7fbb53189c72 (diff)
parent88490da44e8afa0f4d03ca79bcc928a14412ef99 (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/qmlworkerscript/qquickworkerscript.cpp')
0 files changed, 0 insertions, 0 deletions