diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-05-09 11:12:16 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:44:46 +0000 |
| commit | db5900bb675e766179da332ed574f8b4f6e4b935 (patch) | |
| tree | e62e9388183ffb04c150cfac7e34cc76ad16e757 | |
| parent | 2ed452167ef143147137f134639be53bf065112a (diff) | |
Moved dynamicscene-cpp example to manual test
Part of an examples cleanup
Change-Id: Ib2154b36f91093bb248b37a1e41a4cfc51c52880
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | examples/qt3d/qt3d.pro | 1 | ||||
| -rw-r--r-- | tests/manual/dynamicscene-cpp/boxentity.cpp (renamed from examples/qt3d/dynamicscene-cpp/boxentity.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/dynamicscene-cpp/boxentity.h (renamed from examples/qt3d/dynamicscene-cpp/boxentity.h) | 0 | ||||
| -rw-r--r-- | tests/manual/dynamicscene-cpp/doc/src/dynamicscene-cpp.qdoc (renamed from examples/qt3d/dynamicscene-cpp/doc/src/dynamicscene-cpp.qdoc) | 0 | ||||
| -rw-r--r-- | tests/manual/dynamicscene-cpp/dynamicscene-cpp.pro (renamed from examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro) | 4 | ||||
| -rw-r--r-- | tests/manual/dynamicscene-cpp/examplescene.cpp (renamed from examples/qt3d/dynamicscene-cpp/examplescene.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/dynamicscene-cpp/examplescene.h (renamed from examples/qt3d/dynamicscene-cpp/examplescene.h) | 0 | ||||
| -rw-r--r-- | tests/manual/dynamicscene-cpp/main.cpp (renamed from examples/qt3d/dynamicscene-cpp/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 3 |
9 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index 596b9497f..29b728c47 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -13,7 +13,6 @@ SUBDIRS += \ loader-qml \ wave \ materials-cpp \ - dynamicscene-cpp \ scene3d \ enabled-qml \ skybox \ diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.cpp b/tests/manual/dynamicscene-cpp/boxentity.cpp index a39c9a9dc..a39c9a9dc 100644 --- a/examples/qt3d/dynamicscene-cpp/boxentity.cpp +++ b/tests/manual/dynamicscene-cpp/boxentity.cpp diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.h b/tests/manual/dynamicscene-cpp/boxentity.h index f9fdb9580..f9fdb9580 100644 --- a/examples/qt3d/dynamicscene-cpp/boxentity.h +++ b/tests/manual/dynamicscene-cpp/boxentity.h diff --git a/examples/qt3d/dynamicscene-cpp/doc/src/dynamicscene-cpp.qdoc b/tests/manual/dynamicscene-cpp/doc/src/dynamicscene-cpp.qdoc index 4c5709837..4c5709837 100644 --- a/examples/qt3d/dynamicscene-cpp/doc/src/dynamicscene-cpp.qdoc +++ b/tests/manual/dynamicscene-cpp/doc/src/dynamicscene-cpp.qdoc diff --git a/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro b/tests/manual/dynamicscene-cpp/dynamicscene-cpp.pro index 264989f43..21ae58fed 100644 --- a/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro +++ b/tests/manual/dynamicscene-cpp/dynamicscene-cpp.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 3dextras diff --git a/examples/qt3d/dynamicscene-cpp/examplescene.cpp b/tests/manual/dynamicscene-cpp/examplescene.cpp index b11e2f54a..b11e2f54a 100644 --- a/examples/qt3d/dynamicscene-cpp/examplescene.cpp +++ b/tests/manual/dynamicscene-cpp/examplescene.cpp diff --git a/examples/qt3d/dynamicscene-cpp/examplescene.h b/tests/manual/dynamicscene-cpp/examplescene.h index cac6330f3..cac6330f3 100644 --- a/examples/qt3d/dynamicscene-cpp/examplescene.h +++ b/tests/manual/dynamicscene-cpp/examplescene.h diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/tests/manual/dynamicscene-cpp/main.cpp index ebc36ab5f..ebc36ab5f 100644 --- a/examples/qt3d/dynamicscene-cpp/main.cpp +++ b/tests/manual/dynamicscene-cpp/main.cpp diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 9c04b88bc..d35b60b3d 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -12,4 +12,5 @@ SUBDIRS += \ cylinder-cpp \ cylinder-qml \ deferred-renderer-cpp \ - deferred-renderer-qml + deferred-renderer-qml \ + dynamicscene-cpp |