diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-05-09 09:29:48 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:44:36 +0000 |
| commit | f26fd16f80d9f2fc921b3858cc3f763b10aefa2c (patch) | |
| tree | 44c9d59e1989365f18b3443b73e06815de8e671a | |
| parent | e0c32ec2552c13975b191ced99176a15c51c8193 (diff) | |
Moved custom-mesh-qml example to manual test
Part of an examples cleanup
Change-Id: Ic32242b2f9594546fe9a1eed5755e0771d214f15
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | examples/qt3d/qt3d.pro | 1 | ||||
| -rw-r--r-- | tests/manual/custom-mesh-qml/custom-mesh-qml.pro (renamed from examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro) | 4 | ||||
| -rw-r--r-- | tests/manual/custom-mesh-qml/custom-mesh-qml.qrc (renamed from examples/qt3d/custom-mesh-qml/custom-mesh-qml.qrc) | 0 | ||||
| -rw-r--r-- | tests/manual/custom-mesh-qml/main.cpp (renamed from examples/qt3d/custom-mesh-qml/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/custom-mesh-qml/main.qml (renamed from examples/qt3d/custom-mesh-qml/main.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 1 |
6 files changed, 3 insertions, 3 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index b37f31b67..985adde7f 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -30,7 +30,6 @@ SUBDIRS += \ transparency-qml-scene3d \ scene3d-loader \ mouseinput-qml \ - custom-mesh-qml \ instanced-arrays-qml \ picking-qml \ transforms-qml \ diff --git a/examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro b/tests/manual/custom-mesh-qml/custom-mesh-qml.pro index 228cc8ed0..3995fb2a1 100644 --- a/examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro +++ b/tests/manual/custom-mesh-qml/custom-mesh-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 quick 3dquickextras diff --git a/examples/qt3d/custom-mesh-qml/custom-mesh-qml.qrc b/tests/manual/custom-mesh-qml/custom-mesh-qml.qrc index 5f6483ac3..5f6483ac3 100644 --- a/examples/qt3d/custom-mesh-qml/custom-mesh-qml.qrc +++ b/tests/manual/custom-mesh-qml/custom-mesh-qml.qrc diff --git a/examples/qt3d/custom-mesh-qml/main.cpp b/tests/manual/custom-mesh-qml/main.cpp index 41d2f08a5..41d2f08a5 100644 --- a/examples/qt3d/custom-mesh-qml/main.cpp +++ b/tests/manual/custom-mesh-qml/main.cpp diff --git a/examples/qt3d/custom-mesh-qml/main.qml b/tests/manual/custom-mesh-qml/main.qml index a68bf591f..a68bf591f 100644 --- a/examples/qt3d/custom-mesh-qml/main.qml +++ b/tests/manual/custom-mesh-qml/main.qml diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 123a35d72..f0b6734e6 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -8,4 +8,5 @@ SUBDIRS += \ clip-planes-qml \ component-changes \ custom-mesh-cpp \ + custom-mesh-qml \ deferred-renderer-cpp |