diff options
| author |  jan Iversen <jani@libreoffice.org> | 2018-06-05 23:09:03 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-06-08 17:04:43 +0200 |
| commit | 64c0881e9f529d5220e8ac27ad0a78018773449c (patch) | |
| tree | d3521f26953d4cd406d052025e2cc29abb2da617 | |
| parent | f7fde20a2ca4cd7d2489f6e0aa5cd2f7ef73d060 (diff) | |
| download | subsurface-64c0881e9f529d5220e8ac27ad0a78018773449c.tar.gz | |
mobile: decoupled ssrf.qrc and mobile.qrc
remove /subsurface.qrc from .pro
copy missing mapwidget icon references to mobile-resources.pro
Signed-off-by: Jan Iversen <jani@apache.org>
| -rw-r--r-- | mobile-widgets/qml/mobile-resources.qrc | 5 | ||||
| -rw-r--r-- | packaging/ios/Subsurface-mobile.pro | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mobile-widgets/qml/mobile-resources.qrc b/mobile-widgets/qml/mobile-resources.qrc index ff8373d6f..da71ed94e 100644 --- a/mobile-widgets/qml/mobile-resources.qrc +++ b/mobile-widgets/qml/mobile-resources.qrc @@ -35,6 +35,8 @@ <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> @@ -43,6 +45,9 @@ <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="/"> diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro index 4df825821..2fed906ee 100644 --- a/packaging/ios/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile.pro @@ -103,7 +103,7 @@ SOURCES += ../../subsurface-mobile-main.cpp \ ../../profile-widget/diverectitem.cpp \ ../../profile-widget/divetextitem.cpp -RESOURCES += ./qml.qrc ../../subsurface.qrc ../../mobile-widgets/qml/mobile-resources.qrc ./translations.qrc +RESOURCES += ./qml.qrc ../../mobile-widgets/qml/mobile-resources.qrc ./translations.qrc LIBS += ./install-root/lib/libdivecomputer.a \ ./install-root/lib/libgit2.a \ |