aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlscene/main.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-08-24 01:00:36 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-08-24 01:00:36 +0200
commit444d645706d1f0cf287f8f8fc7aa90eb3482a8ea (patch)
tree850df67a76283eaf687f1934ef92c2e4b339ed58 /tools/qmlscene/main.cpp
parentb974b6249a2dce1af8b549fc0d0a5c6dd28d6292 (diff)
parent732c25029ec95feb27a607ef19bb3b7423a955a1 (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Diffstat (limited to 'tools/qmlscene/main.cpp')
0 files changed, 0 insertions, 0 deletions