From ecf3ac12eb7f93e2c0f214af8c1271087df3bac1 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sat, 16 Jan 2021 10:16:29 -0800
Subject: mobile/statistics: make icons available in mobile app

They were bundled via the desktop qrc, but they need a shared qrc that
can be used in both apps.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 CMakeLists.txt        |  2 +-
 Subsurface-mobile.pro |  3 ++-
 stats/statsicons.qrc  | 15 +++++++++++++++
 subsurface.qrc        | 10 ----------
 4 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 stats/statsicons.qrc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49a9ef092..031f6b819 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -301,7 +301,7 @@ endif()
 #set up the subsurface_link_libraries variable
 set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${LIBDIVECOMPUTER_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LIBUSB_LIBRARIES} ${LIBMTP_LIBRARIES})
 if (NOT SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable")
-	qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc map-widget/qml/map-widget.qrc desktop-widgets/qml/statsview2.qrc)
+	qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc stats/statsicons.qrc map-widget/qml/map-widget.qrc desktop-widgets/qml/statsview2.qrc)
 endif()
 
 # hack to build successfully on LGTM
diff --git a/Subsurface-mobile.pro b/Subsurface-mobile.pro
index 19d69c2f2..ea95cf551 100644
--- a/Subsurface-mobile.pro
+++ b/Subsurface-mobile.pro
@@ -334,7 +334,8 @@ HEADERS += \
 
 RESOURCES += mobile-widgets/qml/mobile-resources.qrc \
 		mobile-widgets/3rdparty/icons.qrc \
-		map-widget/qml/map-widget.qrc
+		map-widget/qml/map-widget.qrc \
+		stats/statsicons.qrc
 
 android {
 	SOURCES += core/android.cpp \
diff --git a/stats/statsicons.qrc b/stats/statsicons.qrc
new file mode 100644
index 000000000..18a79c921
--- /dev/null
+++ b/stats/statsicons.qrc
@@ -0,0 +1,15 @@
+<RCC>
+    <qresource prefix="/">
+        <file alias="chart-bar-grouped-horizontal-icon">../icons/chart_bar_grouped_horizontal.svg</file>
+        <file alias="chart-bar-grouped-vertical-icon">../icons/chart_bar_grouped_vertical.svg</file>
+        <file alias="chart-bar-stacked-horizontal-icon">../icons/chart_bar_stacked_horizontal.svg</file>
+        <file alias="chart-bar-stacked-vertical-icon">../icons/chart_bar_stacked_vertical.svg</file>
+        <file alias="chart-bar-horizontal-icon">../icons/chart_bar_horizontal.svg</file>
+        <file alias="chart-bar-vertical-icon">../icons/chart_bar_vertical.svg</file>
+        <file alias="chart-box-icon">../icons/chart_box.svg</file>
+        <file alias="chart-pie-icon">../icons/chart_pie.svg</file>
+        <file alias="chart-points-icon">../icons/chart_points.svg</file>
+        <file alias="chart-warning-icon">../icons/warning-icon.svg</file>
+    </qresource>
+</RCC>
+
diff --git a/subsurface.qrc b/subsurface.qrc
index 2a6f91428..462857b88 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -100,15 +100,5 @@
         <file alias="gps_good_result-icon">icons/resultgreen.png</file>
         <file alias="gps_warning_result-icon">icons/resultyellow.png</file>
         <file alias="gps_bad_result-icon">icons/resultred.png</file>
-        <file alias="chart-bar-grouped-horizontal-icon">icons/chart_bar_grouped_horizontal.svg</file>
-        <file alias="chart-bar-grouped-vertical-icon">icons/chart_bar_grouped_vertical.svg</file>
-        <file alias="chart-bar-stacked-horizontal-icon">icons/chart_bar_stacked_horizontal.svg</file>
-        <file alias="chart-bar-stacked-vertical-icon">icons/chart_bar_stacked_vertical.svg</file>
-        <file alias="chart-bar-horizontal-icon">icons/chart_bar_horizontal.svg</file>
-        <file alias="chart-bar-vertical-icon">icons/chart_bar_vertical.svg</file>
-        <file alias="chart-box-icon">icons/chart_box.svg</file>
-        <file alias="chart-pie-icon">icons/chart_pie.svg</file>
-        <file alias="chart-points-icon">icons/chart_points.svg</file>
-        <file alias="chart-warning-icon">icons/warning-icon.svg</file>
     </qresource>
 </RCC>
-- 
cgit v1.2.3-70-g09d2