From b0b78d200bf6d1366cad9f0152cb515e6241d4bd Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Thu, 20 Dec 2012 16:51:11 +0100
Subject: Use qrc to deploy qml files in declarative-camera examples

Make the declarative-camera example working in shadow builds by including
the Qt Quick assets via a .qrc file.

Change-Id: Iea56e7d69558503abdf15a600a6ce21ea90ee99a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 .../declarative-camera/declarative-camera.pro      |  1 +
 .../declarative-camera/declarative-camera.qrc      | 26 ++++++++++++++++++++++
 .../declarative-camera/qmlcamera.cpp               |  3 +--
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 examples/multimediawidgets/declarative-camera/declarative-camera.qrc

(limited to 'examples/multimediawidgets')

diff --git a/examples/multimediawidgets/declarative-camera/declarative-camera.pro b/examples/multimediawidgets/declarative-camera/declarative-camera.pro
index c52a1d1e6..5fb0a1b51 100644
--- a/examples/multimediawidgets/declarative-camera/declarative-camera.pro
+++ b/examples/multimediawidgets/declarative-camera/declarative-camera.pro
@@ -4,6 +4,7 @@ TARGET=declarative-camera
 QT += quick qml multimedia
 
 SOURCES += qmlcamera.cpp
+RESOURCES += declarative-camera.qrc
 
 target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/declarative-camera
 INSTALLS += target
diff --git a/examples/multimediawidgets/declarative-camera/declarative-camera.qrc b/examples/multimediawidgets/declarative-camera/declarative-camera.qrc
new file mode 100644
index 000000000..d99b86c0c
--- /dev/null
+++ b/examples/multimediawidgets/declarative-camera/declarative-camera.qrc
@@ -0,0 +1,26 @@
+<RCC>
+    <qresource prefix="/">
+        <file>PhotoPreview.qml</file>
+        <file>ZoomControl.qml</file>
+        <file>VideoCaptureControls.qml</file>
+        <file>VideoPreview.qml</file>
+        <file>FocusButton.qml</file>
+        <file>PhotoCaptureControls.qml</file>
+        <file>declarative-camera.qml</file>
+        <file>CameraPropertyPopup.qml</file>
+        <file>CameraPropertyButton.qml</file>
+        <file>CameraButton.qml</file>
+        <file>images/camera_auto_mode.png</file>
+        <file>images/camera_camera_setting.png</file>
+        <file>images/camera_flash_auto.png</file>
+        <file>images/camera_flash_fill.png</file>
+        <file>images/camera_flash_off.png</file>
+        <file>images/camera_flash_redeye.png</file>
+        <file>images/camera_white_balance_cloudy.png</file>
+        <file>images/camera_white_balance_flourescent.png</file>
+        <file>images/camera_white_balance_incandescent.png</file>
+        <file>images/camera_white_balance_sunny.png</file>
+        <file>images/toolbutton.png</file>
+        <file>images/toolbutton.sci</file>
+    </qresource>
+</RCC>
diff --git a/examples/multimediawidgets/declarative-camera/qmlcamera.cpp b/examples/multimediawidgets/declarative-camera/qmlcamera.cpp
index 0d8dbc462..3da615650 100644
--- a/examples/multimediawidgets/declarative-camera/qmlcamera.cpp
+++ b/examples/multimediawidgets/declarative-camera/qmlcamera.cpp
@@ -50,8 +50,7 @@ int main(int argc, char* argv[])
     // Qt.quit() called in embedded .qml by default only emits
     // quit() signal, so do this (optionally use Qt.exit()).
     QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit()));
-    view.setSource(QUrl::fromLocalFile(QCoreApplication::applicationDirPath() +
-                                       QLatin1String("/declarative-camera.qml")));
+    view.setSource(QUrl("qrc:///declarative-camera.qml"));
     view.resize(800, 480);
     view.show();
     return app.exec();
-- 
cgit v1.2.3