mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile: remove MapWidget from mobile-resources.qrc

Browse source 
remove MapWidget entries from mobile-resources.qrc, and
reference map-widget.qrc in Subsurface-mobile.pro for iOS

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-06-20 15:53:59 +02:00 committed by Dirk Hohndel
parent 2b7b7ad8f5
commit ff88e7ee99
2 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
mobile-widgets/qml/mobile-resources.qrc
View file

@ -14,8 +14,6 @@
<file>Log.qml</file>
<file>main.qml</file>
<file>MapPage.qml</file>
<file alias="MapWidget.qml">../../map-widget/qml/MapWidget.qml</file>
<file alias="MapWidgetContextMenu.qml">../../map-widget/qml/MapWidgetContextMenu.qml</file>
<file>Settings.qml</file>
<file>ThemeTest.qml</file>
<file>StartPage.qml</file>
@ -29,23 +27,6 @@
<file alias="subsurface-mobile-icon.png">../../icons/subsurface-mobile-icon.png</file>
</qresource>
<qresource prefix="/">
<!-- ********** mapwidget pictures ********** -->
<file alias="map-style-photo-icon">../../map-widget/qml/icons/mapwidget-toggle-satellite.png</file>
<file alias="map-style-map-icon">../../map-widget/qml/icons/mapwidget-toggle-street.png</file>
<file alias="mapwidget-context-menu.png">../../map-widget/qml/icons/mapwidget-context-menu.png</file>
<file alias="mapwidget-marker.png">../../map-widget/qml/icons/mapwidget-marker.png</file>
<file alias="mapwidget-marker-gray.png">../../map-widget/qml/icons/mapwidget-marker-gray.png</file>
<file alias="mapwidget-toggle-satellite.png">../../map-widget/qml/icons/mapwidget-toggle-satellite.png</file>
<file alias="mapwidget-marker-selected.png">../../map-widget/qml/icons/mapwidget-marker-selected.png</file>
<file alias="mapwidget-toggle-street.png">../../map-widget/qml/icons/mapwidget-toggle-street.png</file>
<file alias="mapwidget-zoom-in.png">../../map-widget/qml/icons/mapwidget-zoom-in.png</file>
<file alias="mapwidget-zoom-out.png">../../map-widget/qml/icons/mapwidget-zoom-out.png</file>
<file alias="open-menu-icon">../../map-widget/qml/icons/mapwidget-context-menu.png</file>
<file alias="zoom-in-icon">../../map-widget/qml/icons/mapwidget-zoom-in.png</file>
<file alias="zoom-out-icon">../../map-widget/qml/icons/mapwidget-zoom-out.png</file>
</qresource>
<qresource prefix="/">
<!-- ********** qtQuick.2 configuration ********** -->
<file>qtquickcontrols2.conf</file>

5
packaging/ios/Subsurface-mobile.pro
View file

@ -104,7 +104,10 @@ SOURCES += ../../subsurface-mobile-main.cpp \
../../profile-widget/diverectitem.cpp \
../../profile-widget/divetextitem.cpp
RESOURCES += ./qml.qrc ../../mobile-widgets/qml/mobile-resources.qrc ./translations.qrc
RESOURCES += ./qml.qrc \
../../mobile-widgets/qml/mobile-resources.qrc \
../../map-widget/qml/map-widget.qrc \
./translations.qrc
LIBS += ./install-root/lib/libdivecomputer.a \
./install-root/lib/libgit2.a \