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/multiviewport | |
| 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/multiviewport')
| -rw-r--r-- | examples/qt3d/multiviewport/main.cpp | 3 | ||||
| -rw-r--r-- | examples/qt3d/multiviewport/multiviewport.pro | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/examples/qt3d/multiviewport/main.cpp b/examples/qt3d/multiviewport/main.cpp index ca9ea8abe..666aa1434 100644 --- a/examples/qt3d/multiviewport/main.cpp +++ b/examples/qt3d/multiviewport/main.cpp @@ -39,8 +39,6 @@ #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> -#include <exampleresources.h> - #include <QGuiApplication> int main(int ac, char **av) @@ -49,7 +47,6 @@ int main(int ac, char **av) Qt3D::Window view; Qt3D::Quick::QQmlAspectEngine engine; - initializeAssetResources("../exampleresources/example-assets.qrb"); engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect); engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); QVariantMap data; diff --git a/examples/qt3d/multiviewport/multiviewport.pro b/examples/qt3d/multiviewport/multiviewport.pro index d7ed38b6d..f6c033a05 100644 --- a/examples/qt3d/multiviewport/multiviewport.pro +++ b/examples/qt3d/multiviewport/multiviewport.pro @@ -2,8 +2,6 @@ TEMPLATE = app QT += 3dcore 3drenderer 3dinput 3dquick qml quick -include("../exampleresources/exampleresources.pri") - HEADERS += \ SOURCES += \ @@ -13,4 +11,5 @@ OTHER_FILES += \ main.qml RESOURCES += \ - multiviewport.qrc + multiviewport.qrc \ + ../exampleresources/test_scene.qrc |