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/gltf | |
| 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/gltf')
| -rw-r--r-- | examples/qt3d/gltf/gltf.pro | 6 | ||||
| -rw-r--r-- | examples/qt3d/gltf/gltf_example.qrc (renamed from examples/qt3d/gltf/gltf.qrc) | 0 | ||||
| -rw-r--r-- | examples/qt3d/gltf/main.cpp | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/examples/qt3d/gltf/gltf.pro b/examples/qt3d/gltf/gltf.pro index d2ac810a9..24208fbdd 100644 --- a/examples/qt3d/gltf/gltf.pro +++ b/examples/qt3d/gltf/gltf.pro @@ -2,8 +2,6 @@ TEMPLATE = app QT += 3dcore 3drenderer 3dinput 3dquick qml quick -include("../exampleresources/exampleresources.pri") - HEADERS += \ SOURCES += \ @@ -13,4 +11,6 @@ OTHER_FILES += \ main.qml RESOURCES += \ - gltf.qrc + gltf_example.qrc \ + ../exampleresources/gltf.qrc \ + ../exampleresources/obj.qrc diff --git a/examples/qt3d/gltf/gltf.qrc b/examples/qt3d/gltf/gltf_example.qrc index c24519313..c24519313 100644 --- a/examples/qt3d/gltf/gltf.qrc +++ b/examples/qt3d/gltf/gltf_example.qrc diff --git a/examples/qt3d/gltf/main.cpp b/examples/qt3d/gltf/main.cpp index a65d56218..523ee4396 100644 --- a/examples/qt3d/gltf/main.cpp +++ b/examples/qt3d/gltf/main.cpp @@ -34,7 +34,6 @@ ** ****************************************************************************/ -#include <exampleresources.h> #include <Qt3DCore/window.h> #include <Qt3DRenderer/qrenderaspect.h> #include <Qt3DInput/QInputAspect> @@ -47,8 +46,6 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - initializeAssetResources("../exampleresources/example-assets.qrb"); - Qt3D::Window view; Qt3D::Quick::QQmlAspectEngine engine; |