diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-05-18 14:50:27 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-05-20 10:03:56 +0000 |
| commit | ad8bdecc68482eda079e8b49c3c5e8059ec45d69 (patch) | |
| tree | 6826bec0fa873ef885d167049efc232cf9cfddc6 /examples/qt3d/cpp_example | |
| parent | ba39a03645ef6f789c8de7da71f1b08d812b2059 (diff) | |
Examples: Remove shared resource library.
Split example-assets.qrc into smaller resource files per
directory and add those to the examples as required.
Task-number: QTBUG-45990
Change-Id: I0a5a6cee64dc23560e9e093f272ff0d90a6e2e97
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/cpp_example')
| -rw-r--r-- | examples/qt3d/cpp_example/cpp_example.pro | 5 | ||||
| -rw-r--r-- | examples/qt3d/cpp_example/main.cpp | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/examples/qt3d/cpp_example/cpp_example.pro b/examples/qt3d/cpp_example/cpp_example.pro index 943f81533..64e9d142e 100644 --- a/examples/qt3d/cpp_example/cpp_example.pro +++ b/examples/qt3d/cpp_example/cpp_example.pro @@ -2,8 +2,9 @@ TEMPLATE = app QT += 3dcore 3drenderer 3dinput -include("../exampleresources/exampleresources.pri") - SOURCES += main.cpp +RESOURCES += \ + ../exampleresources/test_scene.qrc \ + ../exampleresources/gltf.qrc diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp index df20ba030..014e8d958 100644 --- a/examples/qt3d/cpp_example/main.cpp +++ b/examples/qt3d/cpp_example/main.cpp @@ -36,8 +36,6 @@ #include <QGuiApplication> -#include <exampleresources.h> - #include <Qt3DCore/window.h> #include <Qt3DCore/qcamera.h> #include <Qt3DCore/qentity.h> @@ -73,8 +71,6 @@ int main(int ac, char **av) { QGuiApplication app(ac, av); - initializeAssetResources("../exampleresources/example-assets.qrb"); - Qt3D::Window view; Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); |