diff options
author | Robert Brock <robert.brock@kdab.com> | 2016-05-06 10:45:25 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:44:22 +0000 |
commit | ca1492cb1fa22e0e6f95b88ba68f5b3b80969c33 (patch) | |
tree | a45c4a3e215d10982a11dd6c7255a3fec6b16cff | |
parent | 4ecc8ae1349b0ad4d9614a3f325159f2ab199f60 (diff) |
Moved bigmodel-qml example to manual test
Part of an examples cleanup
Change-Id: I1e5be9e6fb76ce7f9d0289f5f71fcb46af44012e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | examples/qt3d/qt3d.pro | 1 | ||||
-rw-r--r-- | tests/manual/bigmodel-qml/MyEntity.qml (renamed from examples/qt3d/bigmodel-qml/MyEntity.qml) | 0 | ||||
-rw-r--r-- | tests/manual/bigmodel-qml/bigmodel-qml.pro (renamed from examples/qt3d/bigmodel-qml/bigmodel-qml.pro) | 4 | ||||
-rw-r--r-- | tests/manual/bigmodel-qml/bigmodel-qml.qrc (renamed from examples/qt3d/bigmodel-qml/bigmodel-qml.qrc) | 0 | ||||
-rw-r--r-- | tests/manual/bigmodel-qml/doc/src/bigmodel-qml.qdoc (renamed from examples/qt3d/bigmodel-qml/doc/src/bigmodel-qml.qdoc) | 0 | ||||
-rw-r--r-- | tests/manual/bigmodel-qml/main.cpp (renamed from examples/qt3d/bigmodel-qml/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/bigmodel-qml/main.qml (renamed from examples/qt3d/bigmodel-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 8340c2a1c..2aabe9b30 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -7,7 +7,6 @@ SUBDIRS += \ multiviewport \ cylinder-qml \ cylinder-cpp \ - bigmodel-qml \ wireframe \ tessellation-modes \ deferred-renderer-qml \ diff --git a/examples/qt3d/bigmodel-qml/MyEntity.qml b/tests/manual/bigmodel-qml/MyEntity.qml index c2c7e5d7c..c2c7e5d7c 100644 --- a/examples/qt3d/bigmodel-qml/MyEntity.qml +++ b/tests/manual/bigmodel-qml/MyEntity.qml diff --git a/examples/qt3d/bigmodel-qml/bigmodel-qml.pro b/tests/manual/bigmodel-qml/bigmodel-qml.pro index cb590374a..54d0942e5 100644 --- a/examples/qt3d/bigmodel-qml/bigmodel-qml.pro +++ b/tests/manual/bigmodel-qml/bigmodel-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 3dextras 3dquickextras diff --git a/examples/qt3d/bigmodel-qml/bigmodel-qml.qrc b/tests/manual/bigmodel-qml/bigmodel-qml.qrc index 6cc293f70..6cc293f70 100644 --- a/examples/qt3d/bigmodel-qml/bigmodel-qml.qrc +++ b/tests/manual/bigmodel-qml/bigmodel-qml.qrc diff --git a/examples/qt3d/bigmodel-qml/doc/src/bigmodel-qml.qdoc b/tests/manual/bigmodel-qml/doc/src/bigmodel-qml.qdoc index 194fcfde9..194fcfde9 100644 --- a/examples/qt3d/bigmodel-qml/doc/src/bigmodel-qml.qdoc +++ b/tests/manual/bigmodel-qml/doc/src/bigmodel-qml.qdoc diff --git a/examples/qt3d/bigmodel-qml/main.cpp b/tests/manual/bigmodel-qml/main.cpp index c004e2a45..c004e2a45 100644 --- a/examples/qt3d/bigmodel-qml/main.cpp +++ b/tests/manual/bigmodel-qml/main.cpp diff --git a/examples/qt3d/bigmodel-qml/main.qml b/tests/manual/bigmodel-qml/main.qml index 61d9d39a5..61d9d39a5 100644 --- a/examples/qt3d/bigmodel-qml/main.qml +++ b/tests/manual/bigmodel-qml/main.qml diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 2dcb9367b..8f634f5d9 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -2,4 +2,5 @@ TEMPLATE = subdirs SUBDIRS += \ assimp \ - bigscene-cpp + bigscene-cpp \ + bigmodel-qml |