diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-05-09 11:20:03 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:44:51 +0000 |
| commit | 14449db181a5b7a6fc273b8d9da2a7a5a1f1d603 (patch) | |
| tree | d39683a6fc3b515683c966079859813b6016f990 | |
| parent | 972f618c87d534172f3ae351efd055c83248a3e7 (diff) | |
Moved gltf example to manual test
Part of an examples cleanup
Change-Id: Id1bee587dd97adcca7bba3f6b4afcf5bd9339c1a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | examples/qt3d/qt3d.pro | 1 | ||||
| -rw-r--r-- | tests/manual/gltf/Wine.qml (renamed from examples/qt3d/gltf/Wine.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/gltf/doc/src/gltf.qdoc (renamed from examples/qt3d/gltf/doc/src/gltf.qdoc) | 0 | ||||
| -rw-r--r-- | tests/manual/gltf/gltf.pro (renamed from examples/qt3d/gltf/gltf.pro) | 6 | ||||
| -rw-r--r-- | tests/manual/gltf/gltf_example.qrc (renamed from examples/qt3d/gltf/gltf_example.qrc) | 0 | ||||
| -rw-r--r-- | tests/manual/gltf/main.cpp (renamed from examples/qt3d/gltf/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/gltf/main.qml (renamed from examples/qt3d/gltf/main.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 3 |
8 files changed, 5 insertions, 5 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index c4ddeb0fc..734be99b1 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -3,7 +3,6 @@ TEMPLATE = subdirs SUBDIRS += \ simple-qml \ simple-cpp \ - gltf \ multiviewport \ wireframe \ tessellation-modes \ diff --git a/examples/qt3d/gltf/Wine.qml b/tests/manual/gltf/Wine.qml index fc25cfd62..fc25cfd62 100644 --- a/examples/qt3d/gltf/Wine.qml +++ b/tests/manual/gltf/Wine.qml diff --git a/examples/qt3d/gltf/doc/src/gltf.qdoc b/tests/manual/gltf/doc/src/gltf.qdoc index 04c57c670..04c57c670 100644 --- a/examples/qt3d/gltf/doc/src/gltf.qdoc +++ b/tests/manual/gltf/doc/src/gltf.qdoc diff --git a/examples/qt3d/gltf/gltf.pro b/tests/manual/gltf/gltf.pro index 2ec5551a9..443141685 100644 --- a/examples/qt3d/gltf/gltf.pro +++ b/tests/manual/gltf/gltf.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 @@ -15,4 +15,4 @@ OTHER_FILES += \ RESOURCES += \ gltf_example.qrc \ - ../exampleresources/gltf.qrc \ + ../../../examples/qt3d/exampleresources/gltf.qrc diff --git a/examples/qt3d/gltf/gltf_example.qrc b/tests/manual/gltf/gltf_example.qrc index 0da7ea21f..0da7ea21f 100644 --- a/examples/qt3d/gltf/gltf_example.qrc +++ b/tests/manual/gltf/gltf_example.qrc diff --git a/examples/qt3d/gltf/main.cpp b/tests/manual/gltf/main.cpp index 8fc9cd8e2..8fc9cd8e2 100644 --- a/examples/qt3d/gltf/main.cpp +++ b/tests/manual/gltf/main.cpp diff --git a/examples/qt3d/gltf/main.qml b/tests/manual/gltf/main.qml index 1afb8c48e..1afb8c48e 100644 --- a/examples/qt3d/gltf/main.qml +++ b/tests/manual/gltf/main.qml diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index e423b47d4..488da56c6 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -14,4 +14,5 @@ SUBDIRS += \ deferred-renderer-cpp \ deferred-renderer-qml \ dynamicscene-cpp \ - enabled-qml + enabled-qml \ + gltf |