diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-05-09 11:27:27 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:44:56 +0000 |
| commit | 679b15c0c483f8adcbd51cd4d06e34506c01f894 (patch) | |
| tree | 96aca123b9d823eca5428d55d0a183f45e19a386 | |
| parent | 3e2f5b76598d17c44d298115f4a5af6841c1e3de (diff) | |
Moved keyboardinput-qml example to manual test
Part of an examples cleanup
Change-Id: If5ed03e83908ba551169d290f51271aaacd73243
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | examples/qt3d/qt3d.pro | 1 | ||||
| -rw-r--r-- | tests/manual/keyboardinput-qml/SphereEntity.qml (renamed from examples/qt3d/keyboardinput-qml/SphereEntity.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/keyboardinput-qml/doc/src/keyboardinput-qml.qdoc (renamed from examples/qt3d/keyboardinput-qml/doc/src/keyboardinput-qml.qdoc) | 0 | ||||
| -rw-r--r-- | tests/manual/keyboardinput-qml/keyboardinput-qml.pro (renamed from examples/qt3d/keyboardinput-qml/keyboardinput-qml.pro) | 4 | ||||
| -rw-r--r-- | tests/manual/keyboardinput-qml/keyboardinput-qml.qrc (renamed from examples/qt3d/keyboardinput-qml/keyboardinput-qml.qrc) | 0 | ||||
| -rw-r--r-- | tests/manual/keyboardinput-qml/main.cpp (renamed from examples/qt3d/keyboardinput-qml/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/keyboardinput-qml/main.qml (renamed from examples/qt3d/keyboardinput-qml/main.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 3 |
8 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index c1bb50edf..b2eb7c806 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -8,7 +8,6 @@ SUBDIRS += \ tessellation-modes \ shadow-map-qml \ materials \ - keyboardinput-qml \ loader-qml \ wave \ materials-cpp \ diff --git a/examples/qt3d/keyboardinput-qml/SphereEntity.qml b/tests/manual/keyboardinput-qml/SphereEntity.qml index 2b7b449d7..2b7b449d7 100644 --- a/examples/qt3d/keyboardinput-qml/SphereEntity.qml +++ b/tests/manual/keyboardinput-qml/SphereEntity.qml diff --git a/examples/qt3d/keyboardinput-qml/doc/src/keyboardinput-qml.qdoc b/tests/manual/keyboardinput-qml/doc/src/keyboardinput-qml.qdoc index c84671ec3..c84671ec3 100644 --- a/examples/qt3d/keyboardinput-qml/doc/src/keyboardinput-qml.qdoc +++ b/tests/manual/keyboardinput-qml/doc/src/keyboardinput-qml.qdoc diff --git a/examples/qt3d/keyboardinput-qml/keyboardinput-qml.pro b/tests/manual/keyboardinput-qml/keyboardinput-qml.pro index 406c6b8b8..e10c58faf 100644 --- a/examples/qt3d/keyboardinput-qml/keyboardinput-qml.pro +++ b/tests/manual/keyboardinput-qml/keyboardinput-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 quick qml 3dquickextras diff --git a/examples/qt3d/keyboardinput-qml/keyboardinput-qml.qrc b/tests/manual/keyboardinput-qml/keyboardinput-qml.qrc index 62d3c1b81..62d3c1b81 100644 --- a/examples/qt3d/keyboardinput-qml/keyboardinput-qml.qrc +++ b/tests/manual/keyboardinput-qml/keyboardinput-qml.qrc diff --git a/examples/qt3d/keyboardinput-qml/main.cpp b/tests/manual/keyboardinput-qml/main.cpp index 70a8ec467..70a8ec467 100644 --- a/examples/qt3d/keyboardinput-qml/main.cpp +++ b/tests/manual/keyboardinput-qml/main.cpp diff --git a/examples/qt3d/keyboardinput-qml/main.qml b/tests/manual/keyboardinput-qml/main.qml index cc65c4a83..cc65c4a83 100644 --- a/examples/qt3d/keyboardinput-qml/main.qml +++ b/tests/manual/keyboardinput-qml/main.qml diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index abeb7fbce..d09b93288 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -16,4 +16,5 @@ SUBDIRS += \ dynamicscene-cpp \ enabled-qml \ gltf \ - gooch-qml + gooch-qml \ + keyboardinput-qml |