diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-05-10 15:37:17 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:45:27 +0000 |
| commit | eee0745693050bac1e42d2f386d2c8507bd0fda0 (patch) | |
| tree | 31efa1bcf14d32670a077ac2e9ca740aafe878b2 | |
| parent | ada62a79b3858c9294854664c3058184f358598e (diff) | |
Moved assimp-cpp example to manual test
Part of an examples cleanup
Change-Id: I1abf679795f7cdc23922880e598a742e58d9aa0a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | examples/qt3d/qt3d.pro | 3 | ||||
| -rw-r--r-- | tests/manual/assimp-cpp/assimp-cpp.pro (renamed from examples/qt3d/assimp-cpp/assimp-cpp.pro) | 4 | ||||
| -rw-r--r-- | tests/manual/assimp-cpp/main.cpp (renamed from examples/qt3d/assimp-cpp/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index d6eaae8e4..b3f5d91a2 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -25,5 +25,4 @@ qtHaveModule(multimedia): SUBDIRS += audio-visualizer-qml # TODO Port the old examples to new APIs #SUBDIRS += qt3d -qtHaveModule(widgets): SUBDIRS += assimp-cpp \ - basicshapes-cpp +qtHaveModule(widgets): SUBDIRS += basicshapes-cpp diff --git a/examples/qt3d/assimp-cpp/assimp-cpp.pro b/tests/manual/assimp-cpp/assimp-cpp.pro index 201cef7a2..b8d0b1b3b 100644 --- a/examples/qt3d/assimp-cpp/assimp-cpp.pro +++ b/tests/manual/assimp-cpp/assimp-cpp.pro @@ -2,8 +2,8 @@ android|ios|tvos|winrt { warning( "This example is not supported for android, ios, tvos, or winrt." ) } -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) +!include( ../manual.pri ) { + error( "Couldn't find the manual.pri file!" ) } QT += widgets 3dcore 3drender 3dinput 3dextras diff --git a/examples/qt3d/assimp-cpp/main.cpp b/tests/manual/assimp-cpp/main.cpp index 9701cb66a..9701cb66a 100644 --- a/examples/qt3d/assimp-cpp/main.cpp +++ b/tests/manual/assimp-cpp/main.cpp diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 322a056e2..534f0e21f 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -29,3 +29,5 @@ SUBDIRS += \ transforms-qml \ transparency-qml \ transparency-qml-scene3d + +qtHaveModule(widgets): SUBDIRS += assimp-cpp |