Allow resources to be either compiled in or read off disk

artriculate.pro

@@ -2,7 +2,7 @@ TEMPLATE = subdirs
 
 CONFIG += ordered
 
-SUBDIRS += src qml
+SUBDIRS += src
 
 symlink.path = /usr/bin
 symlink.files = artriculate

qml/qml.pro

@@ -1,51 +0,0 @@
-TEMPLATE = subdirs
-
-DISTFILES += \
-        main.qml \
-        qmldir \
-        widgets/Widget.qml \
-        widgets/FPS.qml \
-        widgets/Clock.qml \
-        widgets/ItemCount.qml \
-        widgets/Resolution.qml \
-        widgets/InfoTray.qml \
-        common/VisualEffect.qml \
-        common/ArtImage.qml \
-        common/View.qml \
-        physics/BoxBody.qml \
-        physics/ImageBoxBody.qml \
-        physics/ArtBoxBody.qml \
-        physics/RectangleBoxBody.qml \
-        views/well/WellDelegate.qml \
-        views/well/Well.qml \
-        views/cascade/Cascade.qml \
-        views/cascade/CascadeDelegate.qml \
-        views/conveyor/Conveyor.qml \
-        views/conveyor/Monty_python_foot.png \
-        views/basic/Basic.qml \
-        views/reel/Reel.qml \
-        views/reel/ReelImage.qml \
-        views/procession/Procession.qml \
-        views/procession/ProcessionImage.qml \
-        views/simplelistview/SimpleListView.qml \
-        unlicensed/Unlicensed.qml \
-        unlicensed/unlicensed.png \
-        3rdparty/effects/Effects.qml \
-        3rdparty/effects/Effect.qml \
-        3rdparty/effects/Billboard.qml \
-        3rdparty/effects/Emboss.qml \
-        3rdparty/effects/GaussianBlur.qml \
-        3rdparty/backdrops/qml-presentation-visuals/Swirl.qml \
-        3rdparty/backdrops/qml-presentation-visuals/BackgroundSwirls.qml \
-        3rdparty/backdrops/qml-presentation-visuals/particle.png \
-        3rdparty/backdrops/cells/cells.qml \
-        3rdparty/backdrops/cells/noise.png \
-        3rdparty/effects/shaders/billboard.fsh \
-        3rdparty/effects/shaders/emboss.fsh \
-        3rdparty/effects/shaders/gaussianblur_h.fsh \
-        3rdparty/effects/shaders/gaussianblur_v.fsh
-
-qml.path = /usr/share/artriculate/qml
-qml.files = *
-
-INSTALLS += qml

src/main.cpp

@@ -123,11 +123,15 @@ int main(int argc, char *argv[])
     qmlRegisterType<PictureModel>("PictureModel", 1, 0, "PictureModel");
 
     QString qmlPath;
+#ifdef COMPILED_RESOURCES
+    qmlPath = "qrc:/qml";
+#else
     if (QDir(app.applicationDirPath()).dirName() == "src") {
         qmlPath = QCoreApplication::applicationDirPath() % "/../qml";
     } else {
         qmlPath = "/usr/share/" % app.applicationName() % "/qml";
     }
+#endif
 
     engine.addImportPath(qmlPath);
     engine.rootContext()->setContextProperty("nativeUtils", &nativeUtils);

src/src.pro

@@ -14,6 +14,62 @@ SOURCES += main.cpp \
 
 RESOURCES += resources/resources.qrc
 
+DISTFILES += \
+    ../qml/main.qml \
+    ../qml/qmldir \
+    ../qml/widgets/Widget.qml \
+    ../qml/widgets/FPS.qml \
+    ../qml/widgets/Clock.qml \
+    ../qml/widgets/ItemCount.qml \
+    ../qml/widgets/Resolution.qml \
+    ../qml/widgets/InfoTray.qml \
+    ../qml/widgets/RebootReq.qml \
+    ../qml/common/VisualEffect.qml \
+    ../qml/common/ArtImage.qml \
+    ../qml/common/View.qml \
+    ../qml/physics/BoxBody.qml \
+    ../qml/physics/ImageBoxBody.qml \
+    ../qml/physics/ArtBoxBody.qml \
+    ../qml/physics/RectangleBoxBody.qml \
+    ../qml/views/well/WellDelegate.qml \
+    ../qml/views/well/Well.qml \
+    ../qml/views/cascade/Cascade.qml \
+    ../qml/views/cascade/CascadeDelegate.qml \
+    ../qml/views/conveyor/Conveyor.qml \
+    ../qml/views/conveyor/Monty_python_foot.png \
+    ../qml/views/basic/Basic.qml \
+    ../qml/views/reel/Reel.qml \
+    ../qml/views/reel/ReelImage.qml \
+    ../qml/views/procession/Procession.qml \
+    ../qml/views/procession/ProcessionImage.qml \
+    ../qml/views/simplelistview/SimpleListView.qml \
+    ../qml/unlicensed/Unlicensed.qml \
+    ../qml/unlicensed/unlicensed.png \
+    ../qml/3rdparty/effects/Effects.qml \
+    ../qml/3rdparty/effects/Effect.qml \
+    ../qml/3rdparty/effects/Billboard.qml \
+    ../qml/3rdparty/effects/Emboss.qml \
+    ../qml/3rdparty/effects/GaussianBlur.qml \
+    ../qml/3rdparty/backdrops/qml-presentation-visuals/Swirl.qml \
+    ../qml/3rdparty/backdrops/qml-presentation-visuals/BackgroundSwirls.qml \
+    ../qml/3rdparty/backdrops/qml-presentation-visuals/particle.png \
+    ../qml/3rdparty/backdrops/cells/cells.qml \
+    ../qml/3rdparty/backdrops/cells/noise.png \
+    ../qml/3rdparty/effects/shaders/billboard.fsh \
+    ../qml/3rdparty/effects/shaders/emboss.fsh \
+    ../qml/3rdparty/effects/shaders/gaussianblur_h.fsh \
+    ../qml/3rdparty/effects/shaders/gaussianblur_v.fsh
+
+qml.path = /usr/share/artriculate/qml
+qml.files = ../qml/*
+
+compiledResources {
+    RESOURCES += $$DISTFILES
+    DEFINES += COMPILED_RESOURCES
+} else {
+    INSTALLS += qml
+}
+
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =