mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile/statistics: make icons available in mobile app

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2021-01-16 10:16:29 -08:00
parent 31e26fd144
commit ecf3ac12eb
4 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -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

3
Subsurface-mobile.pro
View file

@ -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 \

15
stats/statsicons.qrc Normal file
View file

@ -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>

10
subsurface.qrc
View file

@ -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>