From ad8bdecc68482eda079e8b49c3c5e8059ec45d69 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 18 May 2015 14:50:27 +0200 Subject: Examples: Remove shared resource library. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ö Reviewed-by: Paul Lemire --- examples/qt3d/shadow-map-qml/main.cpp | 4 ---- examples/qt3d/shadow-map-qml/shadow-map-qml.pro | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'examples/qt3d/shadow-map-qml') diff --git a/examples/qt3d/shadow-map-qml/main.cpp b/examples/qt3d/shadow-map-qml/main.cpp index 31836bf9d..2357106c7 100644 --- a/examples/qt3d/shadow-map-qml/main.cpp +++ b/examples/qt3d/shadow-map-qml/main.cpp @@ -43,14 +43,10 @@ #include #include -#include - 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/shadow-map-qml/shadow-map-qml.pro b/examples/qt3d/shadow-map-qml/shadow-map-qml.pro index 7d7670022..76ded6a5c 100644 --- a/examples/qt3d/shadow-map-qml/shadow-map-qml.pro +++ b/examples/qt3d/shadow-map-qml/shadow-map-qml.pro @@ -2,8 +2,6 @@ TEMPLATE = app QT += 3dcore 3drenderer 3dinput 3dquick qml quick -include("../exampleresources/exampleresources.pri") - SOURCES += \ main.cpp @@ -18,4 +16,5 @@ OTHER_FILES += \ GroundPlane.qml RESOURCES += \ - shadow-map-qml.qrc + shadow-map-qml.qrc \ + ../exampleresources/obj.qrc -- cgit v1.2.3