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/materials-cpp | |
| 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/materials-cpp')
| -rw-r--r-- | examples/qt3d/materials-cpp/main.cpp | 2 | ||||
| -rw-r--r-- | examples/qt3d/materials-cpp/materials-cpp.pro | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp index 3704ffcdf..2e5a4834b 100644 --- a/examples/qt3d/materials-cpp/main.cpp +++ b/examples/qt3d/materials-cpp/main.cpp @@ -53,13 +53,11 @@ #include "planeentity.h" #include "rotatingtrefoilknot.h" #include "barrel.h" -#include "exampleresources.h" #include "houseplant.h" int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - initializeAssetResources("../exampleresources/example-assets.qrb"); Qt3D::Window view; Qt3D::QAspectEngine engine; diff --git a/examples/qt3d/materials-cpp/materials-cpp.pro b/examples/qt3d/materials-cpp/materials-cpp.pro index 351ed82f8..0f09346c0 100644 --- a/examples/qt3d/materials-cpp/materials-cpp.pro +++ b/examples/qt3d/materials-cpp/materials-cpp.pro @@ -2,8 +2,6 @@ TEMPLATE = app QT += 3dcore 3drenderer 3dinput -include("../exampleresources/exampleresources.pri") - HEADERS += \ planeentity.h \ renderableentity.h \ @@ -20,3 +18,10 @@ SOURCES += \ barrel.cpp \ rotatingtrefoilknot.cpp \ houseplant.cpp + +RESOURCES += \ + ../exampleresources/chest.qrc \ + ../exampleresources/houseplants.qrc \ + ../exampleresources/metalbarrel.qrc \ + ../exampleresources/obj.qrc \ + ../exampleresources/textures.qrc |