diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-05-09 08:42:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-09 09:09:28 +0000 |
| commit | c5ff1f7f159b4dfa0fc2803df9866eab18339eaa (patch) | |
| tree | 414037b99d63dbcc405db046594e900076ef4c2e /tests/manual/manual.pro | |
| parent | 5679b23c5338ae41d12755cf4e26a95bc391d0a9 (diff) | |
| parent | e9642824244fa9fe55dca2cef8e002192a4f1b17 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/render/backend/abstractrenderer_p.h
src/render/renderers/opengl/renderer/renderer.cpp
tests/auto/render/renderer/tst_renderer.cpp
Change-Id: Ib6da858f10bec57bdb1002bd8fa4172304d118f2
Diffstat (limited to 'tests/manual/manual.pro')
| -rw-r--r-- | tests/manual/manual.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index f5a51907a..93890007c 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -13,6 +13,7 @@ SUBDIRS += \ custom-mesh-update-data-cpp \ custom-mesh-update-data-qml \ cylinder-cpp \ + cylinder-parent-test \ cylinder-qml \ deferred-renderer-cpp \ deferred-renderer-qml \ |