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 | |
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')
-rw-r--r-- | examples/qt3d/materials/main.cpp | 4 | ||||
-rw-r--r-- | examples/qt3d/materials/materials.pro | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/examples/qt3d/materials/main.cpp b/examples/qt3d/materials/main.cpp index 20b518734..e27bbdaff 100644 --- a/examples/qt3d/materials/main.cpp +++ b/examples/qt3d/materials/main.cpp @@ -39,8 +39,6 @@ #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> -#include <exampleresources.h> - #include <QGuiApplication> #include <QtQml> @@ -48,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; diff --git a/examples/qt3d/materials/materials.pro b/examples/qt3d/materials/materials.pro index 23d4d38a8..58631f90e 100644 --- a/examples/qt3d/materials/materials.pro +++ b/examples/qt3d/materials/materials.pro @@ -2,8 +2,6 @@ TEMPLATE = app QT += 3dcore 3drenderer 3dinput 3dquick qml quick -include("../exampleresources/exampleresources.pri") - HEADERS += \ SOURCES += \ @@ -15,4 +13,9 @@ OTHER_FILES += \ HousePlant.qml RESOURCES += \ - materials.qrc + materials.qrc \ + ../exampleresources/chest.qrc \ + ../exampleresources/houseplants.qrc \ + ../exampleresources/metalbarrel.qrc \ + ../exampleresources/obj.qrc \ + ../exampleresources/textures.qrc |