aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qt-ui/globe.cpp8
-rw-r--r--subsurface-install.pri2
2 files changed, 7 insertions, 3 deletions
diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp
index 42e97c898..83b9464b4 100644
--- a/qt-ui/globe.cpp
+++ b/qt-ui/globe.cpp
@@ -38,9 +38,13 @@ GlobeGPS::GlobeGPS(QWidget* parent) : MarbleWidget(parent), loadedDives(0)
foundGoogleMap = true;
if (!foundGoogleMap) {
subsurfaceDataPath = getSubsurfaceDataPath("marbledata");
- qDebug() << subsurfaceDataPath;
- if (subsurfaceDataPath != "")
+ if (subsurfaceDataPath != "") {
MarbleDirs::setMarbleDataPath(subsurfaceDataPath);
+ } else {
+ subsurfaceDataPath = getSubsurfaceDataPath("data");
+ if (subsurfaceDataPath != "")
+ MarbleDirs::setMarbleDataPath(subsurfaceDataPath);
+ }
}
messageWidget = new KMessageWidget(this);
messageWidget->setCloseButtonVisible(false);
diff --git a/subsurface-install.pri b/subsurface-install.pri
index 89d1958a8..1cf4f2f0c 100644
--- a/subsurface-install.pri
+++ b/subsurface-install.pri
@@ -141,7 +141,7 @@ XSLTDIR = $(DATADIR)/subsurface
icon.files = $$ICON
xslt.path = /$(XSLTDIR)
- marbledir.path = /$(DATADIR)/subsurface
+ marbledir.path = /$(DATADIR)/subsurface/data
doc.path = /$(DOCDIR)
doc.CONFIG += no_check_exist