diff options
| -rw-r--r-- | examples/qt3d/assimp/assimp.pro | 17 | ||||
| -rw-r--r-- | examples/qt3d/qt3d.pro | 3 | ||||
| -rw-r--r-- | tests/manual/assimp/assimp.pro | 17 | ||||
| -rw-r--r-- | tests/manual/assimp/assimp.qrc (renamed from examples/qt3d/assimp/assimp.qrc) | 0 | ||||
| -rw-r--r-- | tests/manual/assimp/doc/src/assimp.qdoc (renamed from examples/qt3d/assimp/doc/src/assimp.qdoc) | 0 | ||||
| -rw-r--r-- | tests/manual/assimp/main.cpp (renamed from examples/qt3d/assimp/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/assimp/main.qml (renamed from examples/qt3d/assimp/main.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/manual.pri | 3 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 4 | ||||
| -rw-r--r-- | tests/tests.pro | 4 |
10 files changed, 28 insertions, 20 deletions
diff --git a/examples/qt3d/assimp/assimp.pro b/examples/qt3d/assimp/assimp.pro deleted file mode 100644 index 97f502bc7..000000000 --- a/examples/qt3d/assimp/assimp.pro +++ /dev/null @@ -1,17 +0,0 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} - -SOURCE += main.cpp - -QT += qml quick 3dcore 3drender 3dinput 3dquick 3dextras 3dquickextras - -OTHER_FILES += main.qml - -SOURCES += \ - main.cpp - -RESOURCES += \ - assimp.qrc \ - ../exampleresources/test_scene.qrc \ - ../exampleresources/chest.qrc diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index e5aff7a54..afaeda6d3 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -4,7 +4,6 @@ SUBDIRS += \ simple-qml \ simple-cpp \ gltf \ - assimp \ multiviewport \ cylinder-qml \ cylinder-cpp \ @@ -45,7 +44,6 @@ SUBDIRS += \ compute-particles \ component-changes - qtHaveModule(multimedia): SUBDIRS += audio-visualizer-qml # qmake seems to break in some CI configurations, disable this for now @@ -53,5 +51,6 @@ qtHaveModule(multimedia): SUBDIRS += audio-visualizer-qml # TODO Port the old examples to new APIs #SUBDIRS += qt3d + qtHaveModule(widgets): SUBDIRS += assimp-cpp \ basicshapes-cpp diff --git a/tests/manual/assimp/assimp.pro b/tests/manual/assimp/assimp.pro new file mode 100644 index 000000000..5e74f760a --- /dev/null +++ b/tests/manual/assimp/assimp.pro @@ -0,0 +1,17 @@ +!include( ../manual.pri ) { + error( "Couldn't find the manual.pri file!" ) +} + +SOURCE += main.cpp + +QT += qml quick 3dcore 3drender 3dinput 3dquick 3dextras 3dquickextras + +OTHER_FILES += main.qml + +SOURCES += \ + main.cpp + +RESOURCES += \ + assimp.qrc \ + ../../../examples/qt3d/exampleresources/test_scene.qrc \ + ../../../examples/qt3d/exampleresources/chest.qrc diff --git a/examples/qt3d/assimp/assimp.qrc b/tests/manual/assimp/assimp.qrc index 5f6483ac3..5f6483ac3 100644 --- a/examples/qt3d/assimp/assimp.qrc +++ b/tests/manual/assimp/assimp.qrc diff --git a/examples/qt3d/assimp/doc/src/assimp.qdoc b/tests/manual/assimp/doc/src/assimp.qdoc index 31833a1b8..31833a1b8 100644 --- a/examples/qt3d/assimp/doc/src/assimp.qdoc +++ b/tests/manual/assimp/doc/src/assimp.qdoc diff --git a/examples/qt3d/assimp/main.cpp b/tests/manual/assimp/main.cpp index 5df575e32..5df575e32 100644 --- a/examples/qt3d/assimp/main.cpp +++ b/tests/manual/assimp/main.cpp diff --git a/examples/qt3d/assimp/main.qml b/tests/manual/assimp/main.qml index f3ea3c7a5..f3ea3c7a5 100644 --- a/examples/qt3d/assimp/main.qml +++ b/tests/manual/assimp/main.qml diff --git a/tests/manual/manual.pri b/tests/manual/manual.pri new file mode 100644 index 000000000..eb8a7f829 --- /dev/null +++ b/tests/manual/manual.pri @@ -0,0 +1,3 @@ +TEMPLATE = app + +QT += 3dextras diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro new file mode 100644 index 000000000..7a566cb5b --- /dev/null +++ b/tests/manual/manual.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs + +SUBDIRS += \ + assimp diff --git a/tests/tests.pro b/tests/tests.pro index 55b817602..2ab283fc2 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,6 +1,8 @@ TEMPLATE = subdirs -!package: SUBDIRS += auto +!package: SUBDIRS += \ + auto \ + manual # Benchmarks make sense in release mode only. # Disable them for code coverage. |