diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-05-09 11:35:33 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:44:59 +0000 |
| commit | 9334b8dfb1767d8e8fcd117be0fa5c28a5e4be96 (patch) | |
| tree | 2f6605ddc4a766d31ed71fa07564f10931366813 | |
| parent | 679b15c0c483f8adcbd51cd4d06e34506c01f894 (diff) | |
Moved loader-qml example to manual test
Part of an examples cleanup
Change-Id: Id3563ea8e0afa03a2becf787be9cddb83130778e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | examples/qt3d/qt3d.pro | 1 | ||||
| -rw-r--r-- | tests/manual/loader-qml/CuboidEntity.qml (renamed from examples/qt3d/loader-qml/CuboidEntity.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/loader-qml/SphereEntity.qml (renamed from examples/qt3d/loader-qml/SphereEntity.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/loader-qml/doc/src/loader-qml.qdoc (renamed from examples/qt3d/loader-qml/doc/src/loader-qml.qdoc) | 0 | ||||
| -rw-r--r-- | tests/manual/loader-qml/loader-qml.pro (renamed from examples/qt3d/loader-qml/loader-qml.pro) | 4 | ||||
| -rw-r--r-- | tests/manual/loader-qml/loader-qml.qrc (renamed from examples/qt3d/loader-qml/loader-qml.qrc) | 0 | ||||
| -rw-r--r-- | tests/manual/loader-qml/main.cpp (renamed from examples/qt3d/loader-qml/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/loader-qml/main.qml (renamed from examples/qt3d/loader-qml/main.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 3 |
9 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index b2eb7c806..64abfa872 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -8,7 +8,6 @@ SUBDIRS += \ tessellation-modes \ shadow-map-qml \ materials \ - loader-qml \ wave \ materials-cpp \ scene3d \ diff --git a/examples/qt3d/loader-qml/CuboidEntity.qml b/tests/manual/loader-qml/CuboidEntity.qml index 8555b6903..8555b6903 100644 --- a/examples/qt3d/loader-qml/CuboidEntity.qml +++ b/tests/manual/loader-qml/CuboidEntity.qml diff --git a/examples/qt3d/loader-qml/SphereEntity.qml b/tests/manual/loader-qml/SphereEntity.qml index 8e11de99e..8e11de99e 100644 --- a/examples/qt3d/loader-qml/SphereEntity.qml +++ b/tests/manual/loader-qml/SphereEntity.qml diff --git a/examples/qt3d/loader-qml/doc/src/loader-qml.qdoc b/tests/manual/loader-qml/doc/src/loader-qml.qdoc index 9c25d4899..9c25d4899 100644 --- a/examples/qt3d/loader-qml/doc/src/loader-qml.qdoc +++ b/tests/manual/loader-qml/doc/src/loader-qml.qdoc diff --git a/examples/qt3d/loader-qml/loader-qml.pro b/tests/manual/loader-qml/loader-qml.pro index 55572232d..e40d021f4 100644 --- a/examples/qt3d/loader-qml/loader-qml.pro +++ b/tests/manual/loader-qml/loader-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/loader-qml/loader-qml.qrc b/tests/manual/loader-qml/loader-qml.qrc index 8cf177b62..8cf177b62 100644 --- a/examples/qt3d/loader-qml/loader-qml.qrc +++ b/tests/manual/loader-qml/loader-qml.qrc diff --git a/examples/qt3d/loader-qml/main.cpp b/tests/manual/loader-qml/main.cpp index 70a8ec467..70a8ec467 100644 --- a/examples/qt3d/loader-qml/main.cpp +++ b/tests/manual/loader-qml/main.cpp diff --git a/examples/qt3d/loader-qml/main.qml b/tests/manual/loader-qml/main.qml index 272331911..272331911 100644 --- a/examples/qt3d/loader-qml/main.qml +++ b/tests/manual/loader-qml/main.qml diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index d09b93288..8355a9ad7 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -17,4 +17,5 @@ SUBDIRS += \ enabled-qml \ gltf \ gooch-qml \ - keyboardinput-qml + keyboardinput-qml \ + loader-qml |