summaryrefslogtreecommitdiffstats
path: root/tests/manual/qgraphicslayout
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-15 01:00:59 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2020-01-15 10:14:05 +0100
commitd14fd32d403bd8d120fbe92dae06e9cb187c01c8 (patch)
treefbcae21f765b48e0359f9fb303554172caa5a83c /tests/manual/qgraphicslayout
parent96dea48c154e5971593582f92917db3b3f17c7fa (diff)
parent2cbc5f6f7ae8ba580126a7cafc1898377c2a2407 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts: tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/network/access/spdy/tst_spdy.cpp Change-Id: I3196c5f7b34f2ffc9ef1e690d02d5b9bb3270a74
Diffstat (limited to 'tests/manual/qgraphicslayout')
0 files changed, 0 insertions, 0 deletions