From ad8bdecc68482eda079e8b49c3c5e8059ec45d69 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
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ö <topi.reinio@digia.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
---
 examples/qt3d/gltf/gltf.pro         | 6 +++---
 examples/qt3d/gltf/gltf.qrc         | 7 -------
 examples/qt3d/gltf/gltf_example.qrc | 7 +++++++
 examples/qt3d/gltf/main.cpp         | 3 ---
 4 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 examples/qt3d/gltf/gltf.qrc
 create mode 100644 examples/qt3d/gltf/gltf_example.qrc

(limited to 'examples/qt3d/gltf')

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.qrc
deleted file mode 100644
index c24519313..000000000
--- a/examples/qt3d/gltf/gltf.qrc
+++ /dev/null
@@ -1,7 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>main.qml</file>
-        <file>basic.frag</file>
-        <file>basic.vert</file>
-    </qresource>
-</RCC>
diff --git a/examples/qt3d/gltf/gltf_example.qrc b/examples/qt3d/gltf/gltf_example.qrc
new file mode 100644
index 000000000..c24519313
--- /dev/null
+++ b/examples/qt3d/gltf/gltf_example.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/">
+        <file>main.qml</file>
+        <file>basic.frag</file>
+        <file>basic.vert</file>
+    </qresource>
+</RCC>
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;
 
-- 
cgit v1.2.3