diff options
| -rw-r--r-- | examples/qt3d/qt3d.pro | 1 | ||||
| -rw-r--r-- | tests/manual/deferred-renderer-qml/DeferredRenderer.qml (renamed from examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/deferred-renderer-qml/FinalEffect.qml (renamed from examples/qt3d/deferred-renderer-qml/FinalEffect.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/deferred-renderer-qml/GBuffer.qml (renamed from examples/qt3d/deferred-renderer-qml/GBuffer.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/deferred-renderer-qml/SceneEffect.qml (renamed from examples/qt3d/deferred-renderer-qml/SceneEffect.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/deferred-renderer-qml/deferred-renderer-qml.pro (renamed from examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro) | 4 | ||||
| -rw-r--r-- | tests/manual/deferred-renderer-qml/deferred-renderer-qml.qrc (renamed from examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.qrc) | 0 | ||||
| -rw-r--r-- | tests/manual/deferred-renderer-qml/doc/src/deferred-renderer-qml.qdoc (renamed from examples/qt3d/deferred-renderer-qml/doc/src/deferred-renderer-qml.qdoc) | 0 | ||||
| -rw-r--r-- | tests/manual/deferred-renderer-qml/main.cpp (renamed from examples/qt3d/deferred-renderer-qml/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/deferred-renderer-qml/main.qml (renamed from examples/qt3d/deferred-renderer-qml/main.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 3 |
11 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index 451855e00..596b9497f 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -7,7 +7,6 @@ SUBDIRS += \ multiviewport \ wireframe \ tessellation-modes \ - deferred-renderer-qml \ shadow-map-qml \ materials \ keyboardinput-qml \ diff --git a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml b/tests/manual/deferred-renderer-qml/DeferredRenderer.qml index 6f70d2d87..6f70d2d87 100644 --- a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml +++ b/tests/manual/deferred-renderer-qml/DeferredRenderer.qml diff --git a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml b/tests/manual/deferred-renderer-qml/FinalEffect.qml index 482ad91cc..482ad91cc 100644 --- a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml +++ b/tests/manual/deferred-renderer-qml/FinalEffect.qml diff --git a/examples/qt3d/deferred-renderer-qml/GBuffer.qml b/tests/manual/deferred-renderer-qml/GBuffer.qml index bf43c66b5..bf43c66b5 100644 --- a/examples/qt3d/deferred-renderer-qml/GBuffer.qml +++ b/tests/manual/deferred-renderer-qml/GBuffer.qml diff --git a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml b/tests/manual/deferred-renderer-qml/SceneEffect.qml index 5dbfdae63..5dbfdae63 100644 --- a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml +++ b/tests/manual/deferred-renderer-qml/SceneEffect.qml diff --git a/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro b/tests/manual/deferred-renderer-qml/deferred-renderer-qml.pro index 40b2f555c..8f7dc12d5 100644 --- a/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro +++ b/tests/manual/deferred-renderer-qml/deferred-renderer-qml.pro @@ -1,5 +1,5 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) +!include( ../manual.pri ) { + error( "Couldn't find the manual.pri file!" ) } QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras diff --git a/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.qrc b/tests/manual/deferred-renderer-qml/deferred-renderer-qml.qrc index 573b2337e..573b2337e 100644 --- a/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.qrc +++ b/tests/manual/deferred-renderer-qml/deferred-renderer-qml.qrc diff --git a/examples/qt3d/deferred-renderer-qml/doc/src/deferred-renderer-qml.qdoc b/tests/manual/deferred-renderer-qml/doc/src/deferred-renderer-qml.qdoc index 61c7cbd13..61c7cbd13 100644 --- a/examples/qt3d/deferred-renderer-qml/doc/src/deferred-renderer-qml.qdoc +++ b/tests/manual/deferred-renderer-qml/doc/src/deferred-renderer-qml.qdoc diff --git a/examples/qt3d/deferred-renderer-qml/main.cpp b/tests/manual/deferred-renderer-qml/main.cpp index 55bbe91ee..55bbe91ee 100644 --- a/examples/qt3d/deferred-renderer-qml/main.cpp +++ b/tests/manual/deferred-renderer-qml/main.cpp diff --git a/examples/qt3d/deferred-renderer-qml/main.qml b/tests/manual/deferred-renderer-qml/main.qml index b56e0bd5d..b56e0bd5d 100644 --- a/examples/qt3d/deferred-renderer-qml/main.qml +++ b/tests/manual/deferred-renderer-qml/main.qml diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index fba975ac7..9c04b88bc 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -11,4 +11,5 @@ SUBDIRS += \ custom-mesh-qml \ cylinder-cpp \ cylinder-qml \ - deferred-renderer-cpp + deferred-renderer-cpp \ + deferred-renderer-qml |