summaryrefslogtreecommitdiffstats
path: root/tests/auto/compositor/compositor/tst_compositor.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-17 03:00:40 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-17 03:00:40 +0200
commitd96b8afd40f83075c4f76edd0cf80b4fe05b74fa (patch)
treee38903029ce9fd6a097a54953d93a794ee022612 /tests/auto/compositor/compositor/tst_compositor.cpp
parente3fa740d20b31270c09c258215f7d91d94da0cea (diff)
parent434f3e9a952b5858abc1f0ed1179ea5d2fca6a19 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'tests/auto/compositor/compositor/tst_compositor.cpp')
0 files changed, 0 insertions, 0 deletions