diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-05-09 11:23:11 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:44:53 +0000 |
| commit | 3e2f5b76598d17c44d298115f4a5af6841c1e3de (patch) | |
| tree | 0b375e5f692dee834e56cebb84545ed79f9f9f20 | |
| parent | 14449db181a5b7a6fc273b8d9da2a7a5a1f1d603 (diff) | |
Moved gooch-qml example to manual test
Part of an examples cleanup
Change-Id: Ie2cb3ea51d66b7716b401bf0f131e6712e37f262
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | examples/qt3d/qt3d.pro | 1 | ||||
| -rw-r--r-- | tests/manual/gooch-qml/MyEntity.qml (renamed from examples/qt3d/gooch-qml/MyEntity.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/gooch-qml/gooch-qml.pro (renamed from examples/qt3d/gooch-qml/gooch-qml.pro) | 6 | ||||
| -rw-r--r-- | tests/manual/gooch-qml/gooch-qml.qrc (renamed from examples/qt3d/gooch-qml/gooch-qml.qrc) | 0 | ||||
| -rw-r--r-- | tests/manual/gooch-qml/main.cpp (renamed from examples/qt3d/gooch-qml/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/gooch-qml/main.qml (renamed from examples/qt3d/gooch-qml/main.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 3 |
7 files changed, 5 insertions, 5 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index 734be99b1..c1bb50edf 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -19,7 +19,6 @@ SUBDIRS += \ simple-shaders-qml \ planets-qml \ plasma \ - gooch-qml \ transparency-qml \ transparency-qml-scene3d \ scene3d-loader \ diff --git a/examples/qt3d/gooch-qml/MyEntity.qml b/tests/manual/gooch-qml/MyEntity.qml index 0867c0f0e..0867c0f0e 100644 --- a/examples/qt3d/gooch-qml/MyEntity.qml +++ b/tests/manual/gooch-qml/MyEntity.qml diff --git a/examples/qt3d/gooch-qml/gooch-qml.pro b/tests/manual/gooch-qml/gooch-qml.pro index 1239a73c3..b0f2b62d2 100644 --- a/examples/qt3d/gooch-qml/gooch-qml.pro +++ b/tests/manual/gooch-qml/gooch-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 3dquick 3dinput qml quick 3dquickextras @@ -13,4 +13,4 @@ OTHER_FILES += \ RESOURCES += \ gooch-qml.qrc \ - ../exampleresources/obj.qrc + ../../../examples/qt3d/exampleresources/obj.qrc diff --git a/examples/qt3d/gooch-qml/gooch-qml.qrc b/tests/manual/gooch-qml/gooch-qml.qrc index 6cc293f70..6cc293f70 100644 --- a/examples/qt3d/gooch-qml/gooch-qml.qrc +++ b/tests/manual/gooch-qml/gooch-qml.qrc diff --git a/examples/qt3d/gooch-qml/main.cpp b/tests/manual/gooch-qml/main.cpp index 95044bf67..95044bf67 100644 --- a/examples/qt3d/gooch-qml/main.cpp +++ b/tests/manual/gooch-qml/main.cpp diff --git a/examples/qt3d/gooch-qml/main.qml b/tests/manual/gooch-qml/main.qml index 571b894ee..571b894ee 100644 --- a/examples/qt3d/gooch-qml/main.qml +++ b/tests/manual/gooch-qml/main.qml diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 488da56c6..abeb7fbce 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -15,4 +15,5 @@ SUBDIRS += \ deferred-renderer-qml \ dynamicscene-cpp \ enabled-qml \ - gltf + gltf \ + gooch-qml |