diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-05-09 11:01:12 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:44:39 +0000 |
| commit | c471360f62d2cdc6e88ee116af50d874f549317c (patch) | |
| tree | 18dedc8fef96895e0dd1fa21b1ee2f1b061c8280 | |
| parent | f26fd16f80d9f2fc921b3858cc3f763b10aefa2c (diff) | |
Moved cylinder-cpp example to manual test
Part of an examples cleanup
Change-Id: Id293f78a414cfbdc1f1f8796ec0485aacc06a906
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | examples/qt3d/cylinder-cpp/cylinder-cpp.pro | 9 | ||||
| -rw-r--r-- | examples/qt3d/qt3d.pro | 1 | ||||
| -rw-r--r-- | tests/manual/cylinder-cpp/cylinder-cpp.pro | 9 | ||||
| -rw-r--r-- | tests/manual/cylinder-cpp/doc/src/cylinder-cpp.qdoc (renamed from examples/qt3d/cylinder-cpp/doc/src/cylinder-cpp.qdoc) | 0 | ||||
| -rw-r--r-- | tests/manual/cylinder-cpp/main.cpp (renamed from examples/qt3d/cylinder-cpp/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 1 |
6 files changed, 10 insertions, 10 deletions
diff --git a/examples/qt3d/cylinder-cpp/cylinder-cpp.pro b/examples/qt3d/cylinder-cpp/cylinder-cpp.pro deleted file mode 100644 index a1a935145..000000000 --- a/examples/qt3d/cylinder-cpp/cylinder-cpp.pro +++ /dev/null @@ -1,9 +0,0 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} - -QT += 3dcore 3drender 3dinput 3dextras - -SOURCES += main.cpp - - diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index 985adde7f..57651aa52 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -6,7 +6,6 @@ SUBDIRS += \ gltf \ multiviewport \ cylinder-qml \ - cylinder-cpp \ wireframe \ tessellation-modes \ deferred-renderer-qml \ diff --git a/tests/manual/cylinder-cpp/cylinder-cpp.pro b/tests/manual/cylinder-cpp/cylinder-cpp.pro new file mode 100644 index 000000000..d3db3bc76 --- /dev/null +++ b/tests/manual/cylinder-cpp/cylinder-cpp.pro @@ -0,0 +1,9 @@ +!include( ../manual.pri ) { + error( "Couldn't find the manual.pri file!" ) +} + +QT += 3dcore 3drender 3dinput 3dextras + +SOURCES += main.cpp + + diff --git a/examples/qt3d/cylinder-cpp/doc/src/cylinder-cpp.qdoc b/tests/manual/cylinder-cpp/doc/src/cylinder-cpp.qdoc index ed1a53e9a..ed1a53e9a 100644 --- a/examples/qt3d/cylinder-cpp/doc/src/cylinder-cpp.qdoc +++ b/tests/manual/cylinder-cpp/doc/src/cylinder-cpp.qdoc diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/tests/manual/cylinder-cpp/main.cpp index 33a85f32b..33a85f32b 100644 --- a/examples/qt3d/cylinder-cpp/main.cpp +++ b/tests/manual/cylinder-cpp/main.cpp diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index f0b6734e6..d8122f7eb 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -9,4 +9,5 @@ SUBDIRS += \ component-changes \ custom-mesh-cpp \ custom-mesh-qml \ + cylinder-cpp \ deferred-renderer-cpp |