Use Qt resource system for QML and JS files

diff --git a/qml/qml.qrc b/qml/qml.qrc
new file mode 100644 (file)
index 0000000..545b300
--- /dev/null
+++ b/qml/qml.qrc
@@ -0,0 +1,41 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+    <qresource prefix="/qml">
+        <file>main.qml</file>
+       <file>PipelineManager.qml</file>
+       <file>FocusReticle.qml</file>
+       <file>CameraPage.qml</file>
+       <file>ImageSettingsPage.qml</file>
+       <file>Standby.qml</file>
+       <file>CameraSettings.qml</file>
+       <file>VideoPage.qml</file>
+       <file>ImagePage.qml</file>
+       <file>ZoomSlider.qml</file>
+       <file>RecordingPage.qml</file>
+       <file>ModeController.qml</file>
+       <file>ModeButton.qml</file>
+       <file>CaptureButton.qml</file>
+       <file>Indicator.qml</file>
+       <file>CameraToolBar.qml</file>
+       <file>CameraToolBar.js</file>
+       <file>data.js</file>
+       <file>FlashButton.qml</file>
+       <file>ImageSceneButton.qml</file>
+       <file>ImageEvCompButton.qml</file>
+       <file>ImageWhiteBalanceButton.qml</file>
+       <file>ImageColorFilterButton.qml</file>
+       <file>PreviewImage.qml</file>
+       <file>CheckButton.qml</file>
+       <file>VideoTorchButton.qml</file>
+       <file>PostCaptureItem.qml</file>
+       <file>PostCapturePage.qml</file>
+       <file>VideoSettingsPage.qml</file>
+       <file>VideoSceneButton.qml</file>
+       <file>VideoEvCompButton.qml</file>
+       <file>VideoWhiteBalanceButton.qml</file>
+       <file>VideoColorFilterButton.qml</file>
+       <file>VideoMuteButton.qml</file>
+       <file>VideoPlayerPage.qml</file>
+       <file>SectionHeader.qml</file>
+    </qresource>
+</RCC>

diff --git a/src/main.cpp b/src/main.cpp
index d204466..dd2e44f 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -91,8 +91,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
   qmlRegisterType<GalleryHelper>("CameraPlus", 1, 0, "GalleryHelper");
   qmlRegisterType<PostCaptureModel>("CameraPlus", 1, 0, "PostCaptureModel");
 
-  QUrl sourceUrl = QUrl::fromLocalFile(QDir::currentPath() + "/main.qml");
-  view.setSource(sourceUrl);
+  view.setSource(QUrl("qrc:/qml/main.qml"));
 
   view.showFullScreen();
 

diff --git a/src/src.pro b/src/src.pro
index 1a69cdf..6a1427f 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -24,3 +24,5 @@ HEADERS += settings.h filenaming.h quillitem.h displaystate.h fsmonitor.h \
            cameraresources.h compass.h orientation.h geocode.h mountprotector.h \
            trackerstore.h focusrectangle.h sharehelper.h deletehelper.h galleryhelper.h \
            postcapturemodel.h
+
+RESOURCES += ../qml/qml.qrc