diff options
author | Robert Brock <robert.brock@kdab.com> | 2016-05-09 11:44:16 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:45:01 +0000 |
commit | a7be688384cfc0b4af11b3d61a06007d6205e151 (patch) | |
tree | d7732dd2ff7c3e4034563adb0179c013510b93c7 | |
parent | 9334b8dfb1767d8e8fcd117be0fa5c28a5e4be96 (diff) |
Moved mouseinput-qml example to manual test
Part of an examples cleanup
Change-Id: Ib77fedcfc75b5b48a2e1618f90a995b2d9e392ad
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/mouseinput-qml/main.cpp (renamed from examples/qt3d/mouseinput-qml/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/mouseinput-qml/main.qml (renamed from examples/qt3d/mouseinput-qml/main.qml) | 0 | ||||
-rw-r--r-- | tests/manual/mouseinput-qml/mouseinput-qml.pro (renamed from examples/qt3d/mouseinput-qml/mouseinput-qml.pro) | 4 | ||||
-rw-r--r-- | tests/manual/mouseinput-qml/mouseinput-qml.qrc (renamed from examples/qt3d/mouseinput-qml/mouseinput-qml.qrc) | 0 |
6 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index 64abfa872..60eae21c1 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -20,7 +20,6 @@ SUBDIRS += \ transparency-qml \ transparency-qml-scene3d \ scene3d-loader \ - mouseinput-qml \ instanced-arrays-qml \ picking-qml \ transforms-qml \ diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 8355a9ad7..6e14482c9 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -18,4 +18,5 @@ SUBDIRS += \ gltf \ gooch-qml \ keyboardinput-qml \ - loader-qml + loader-qml \ + mouseinput-qml diff --git a/examples/qt3d/mouseinput-qml/main.cpp b/tests/manual/mouseinput-qml/main.cpp index e1a359d2a..e1a359d2a 100644 --- a/examples/qt3d/mouseinput-qml/main.cpp +++ b/tests/manual/mouseinput-qml/main.cpp diff --git a/examples/qt3d/mouseinput-qml/main.qml b/tests/manual/mouseinput-qml/main.qml index de7d115c2..de7d115c2 100644 --- a/examples/qt3d/mouseinput-qml/main.qml +++ b/tests/manual/mouseinput-qml/main.qml diff --git a/examples/qt3d/mouseinput-qml/mouseinput-qml.pro b/tests/manual/mouseinput-qml/mouseinput-qml.pro index a5bad5991..e8b5f42f9 100644 --- a/examples/qt3d/mouseinput-qml/mouseinput-qml.pro +++ b/tests/manual/mouseinput-qml/mouseinput-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 qml quick 3dquickextras diff --git a/examples/qt3d/mouseinput-qml/mouseinput-qml.qrc b/tests/manual/mouseinput-qml/mouseinput-qml.qrc index 5f6483ac3..5f6483ac3 100644 --- a/examples/qt3d/mouseinput-qml/mouseinput-qml.qrc +++ b/tests/manual/mouseinput-qml/mouseinput-qml.qrc |