diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-05-09 12:08:40 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:45:08 +0000 |
| commit | a60a64eb932c8c9ac30ab1bdbaea10e08a382661 (patch) | |
| tree | 844e94683bd0830c961417bcdc243a785e38d63a | |
| parent | bf6cb216007ec6b5cebccbd8505edd28e9371507 (diff) | |
Moved scene3d-loader example to manual test
Part of an examples cleanup
Change-Id: I79cfd451ce1f96938359c3b048523b3687864c48
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | examples/qt3d/qt3d.pro | 1 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 3 | ||||
| -rw-r--r-- | tests/manual/scene3d-loader/AnimatedEntity.qml (renamed from examples/qt3d/scene3d-loader/AnimatedEntity.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/scene3d-loader/Scene.qml (renamed from examples/qt3d/scene3d-loader/Scene.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/scene3d-loader/Scene2.qml (renamed from examples/qt3d/scene3d-loader/Scene2.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/scene3d-loader/main.cpp (renamed from examples/qt3d/scene3d-loader/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/scene3d-loader/main.qml (renamed from examples/qt3d/scene3d-loader/main.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/scene3d-loader/scene3d-loader.pro (renamed from examples/qt3d/scene3d-loader/scene3d-loader.pro) | 4 | ||||
| -rw-r--r-- | tests/manual/scene3d-loader/scene3d-loader.qrc (renamed from examples/qt3d/scene3d-loader/scene3d-loader.qrc) | 0 |
9 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index eb9f2c632..1164ac16a 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -18,7 +18,6 @@ SUBDIRS += \ planets-qml \ transparency-qml \ transparency-qml-scene3d \ - scene3d-loader \ instanced-arrays-qml \ transforms-qml \ lights \ diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 80a563867..b585ca7dd 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -21,4 +21,5 @@ SUBDIRS += \ loader-qml \ mouseinput-qml \ picking-qml \ - plasma + plasma \ + scene3d-loader diff --git a/examples/qt3d/scene3d-loader/AnimatedEntity.qml b/tests/manual/scene3d-loader/AnimatedEntity.qml index 0f6b7da1a..0f6b7da1a 100644 --- a/examples/qt3d/scene3d-loader/AnimatedEntity.qml +++ b/tests/manual/scene3d-loader/AnimatedEntity.qml diff --git a/examples/qt3d/scene3d-loader/Scene.qml b/tests/manual/scene3d-loader/Scene.qml index 9a98ca7f1..9a98ca7f1 100644 --- a/examples/qt3d/scene3d-loader/Scene.qml +++ b/tests/manual/scene3d-loader/Scene.qml diff --git a/examples/qt3d/scene3d-loader/Scene2.qml b/tests/manual/scene3d-loader/Scene2.qml index efbb921c5..efbb921c5 100644 --- a/examples/qt3d/scene3d-loader/Scene2.qml +++ b/tests/manual/scene3d-loader/Scene2.qml diff --git a/examples/qt3d/scene3d-loader/main.cpp b/tests/manual/scene3d-loader/main.cpp index 8886263f4..8886263f4 100644 --- a/examples/qt3d/scene3d-loader/main.cpp +++ b/tests/manual/scene3d-loader/main.cpp diff --git a/examples/qt3d/scene3d-loader/main.qml b/tests/manual/scene3d-loader/main.qml index 7442c7d05..7442c7d05 100644 --- a/examples/qt3d/scene3d-loader/main.qml +++ b/tests/manual/scene3d-loader/main.qml diff --git a/examples/qt3d/scene3d-loader/scene3d-loader.pro b/tests/manual/scene3d-loader/scene3d-loader.pro index 7a1efd955..51a071216 100644 --- a/examples/qt3d/scene3d-loader/scene3d-loader.pro +++ b/tests/manual/scene3d-loader/scene3d-loader.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 += qml quick 3dcore 3drender 3dinput diff --git a/examples/qt3d/scene3d-loader/scene3d-loader.qrc b/tests/manual/scene3d-loader/scene3d-loader.qrc index fdb5e39aa..fdb5e39aa 100644 --- a/examples/qt3d/scene3d-loader/scene3d-loader.qrc +++ b/tests/manual/scene3d-loader/scene3d-loader.qrc |