diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-05-09 11:56:26 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:45:04 +0000 |
| commit | 5dfc7b06b0bf17fa68ecf5786e11d569fff89cd4 (patch) | |
| tree | 410d2f18bcec3bb08039c09ec099407cbeab5203 | |
| parent | a7be688384cfc0b4af11b3d61a06007d6205e151 (diff) | |
Moved picking-qml example to manual test
Part of an examples cleanup
Change-Id: Iaf8783fc456990a36d664540da9aa07ea05f6eb2
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/picking-qml/PickableEntity.qml (renamed from examples/qt3d/picking-qml/PickableEntity.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/picking-qml/main.cpp (renamed from examples/qt3d/picking-qml/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/picking-qml/main.qml (renamed from examples/qt3d/picking-qml/main.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/picking-qml/picking-qml.pro (renamed from examples/qt3d/picking-qml/picking-qml.pro) | 4 | ||||
| -rw-r--r-- | tests/manual/picking-qml/picking-qml.qrc (renamed from examples/qt3d/picking-qml/picking-qml.qrc) | 0 |
7 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index 60eae21c1..20aa09180 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -21,7 +21,6 @@ SUBDIRS += \ transparency-qml-scene3d \ scene3d-loader \ instanced-arrays-qml \ - picking-qml \ transforms-qml \ lights \ compute-particles diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 6e14482c9..af82e9864 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -19,4 +19,5 @@ SUBDIRS += \ gooch-qml \ keyboardinput-qml \ loader-qml \ - mouseinput-qml + mouseinput-qml \ + picking-qml diff --git a/examples/qt3d/picking-qml/PickableEntity.qml b/tests/manual/picking-qml/PickableEntity.qml index edc0327ee..edc0327ee 100644 --- a/examples/qt3d/picking-qml/PickableEntity.qml +++ b/tests/manual/picking-qml/PickableEntity.qml diff --git a/examples/qt3d/picking-qml/main.cpp b/tests/manual/picking-qml/main.cpp index 337a0766a..337a0766a 100644 --- a/examples/qt3d/picking-qml/main.cpp +++ b/tests/manual/picking-qml/main.cpp diff --git a/examples/qt3d/picking-qml/main.qml b/tests/manual/picking-qml/main.qml index 8cd55a627..8cd55a627 100644 --- a/examples/qt3d/picking-qml/main.qml +++ b/tests/manual/picking-qml/main.qml diff --git a/examples/qt3d/picking-qml/picking-qml.pro b/tests/manual/picking-qml/picking-qml.pro index 93fd17583..886cc91aa 100644 --- a/examples/qt3d/picking-qml/picking-qml.pro +++ b/tests/manual/picking-qml/picking-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 3drender-private 3dinput 3dquick qml quick 3dquickextras diff --git a/examples/qt3d/picking-qml/picking-qml.qrc b/tests/manual/picking-qml/picking-qml.qrc index 15bdbb178..15bdbb178 100644 --- a/examples/qt3d/picking-qml/picking-qml.qrc +++ b/tests/manual/picking-qml/picking-qml.qrc |