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

android/desktop: remove mapWidget from subsurface.qrc

Browse source 
remove mapWidget entries from subsurface.qrc, and
add reference to map-widget.qrc in CMakelist.txt

Android uses the same CMakelist.txt

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-06-20 16:06:49 +02:00 committed by Dirk Hohndel
parent ff88e7ee99
commit 5df93e084d
3 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -269,7 +269,7 @@ endif()
#set up the subsurface_link_libraries variable #set up the subsurface_link_libraries variable
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${LIBDIVECOMPUTER_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LIBUSB_LIBRARIES}) set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${LIBDIVECOMPUTER_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LIBUSB_LIBRARIES})
qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc) qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc map-widget/qml/map-widget.qrc)
# include translations # include translations
add_subdirectory(translations) add_subdirectory(translations)

4
desktop-widgets/mapwidget.cpp
View file

@ -11,8 +11,8 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "divelistview.h" #include "divelistview.h"
static const QUrl urlMapWidget = QUrl(QStringLiteral("qrc:/MapWidget.qml")); static const QUrl urlMapWidget = QUrl(QStringLiteral("qrc:/qml/MapWidget.qml"));
static const QUrl urlMapWidgetError = QUrl(QStringLiteral("qrc:/MapWidgetError.qml")); static const QUrl urlMapWidgetError = QUrl(QStringLiteral("qrc:/qml/MapWidgetError.qml"));
static bool isReady = false; static bool isReady = false;
static bool skipReload = false; static bool skipReload = false;

11
subsurface.qrc
View file

@ -1,16 +1,5 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file alias="MapWidget.qml">map-widget/qml/MapWidget.qml</file>
<file alias="MapWidgetError.qml">map-widget/qml/MapWidgetError.qml</file>
<file alias="MapWidgetContextMenu.qml">map-widget/qml/MapWidgetContextMenu.qml</file>
<file alias="dive-location-marker-icon">map-widget/qml/icons/mapwidget-marker.png</file>
<file alias="dive-location-marker-inactive-icon">map-widget/qml/icons/mapwidget-marker-gray.png</file>
<file alias="dive-location-marker-selected-icon">map-widget/qml/icons/mapwidget-marker-selected.png</file>
<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="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>
<file alias="satellite-icon">icons/satellite.svg</file> <file alias="satellite-icon">icons/satellite.svg</file>
<file alias="graph-icon">icons/graph.png</file> <file alias="graph-icon">icons/graph.png</file>
<file alias="hide-icon">icons/go-top.svg</file> <file alias="hide-icon">icons/go-top.svg</file>