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

Fix compilation with upstream Marble

Browse source 
<marble/MarbleDebug.h> is not availaible in all Marble versions.
As Marble::MarbleDebug::setEnabled(verbose) is only used when
MARBLE_SUBSURFACE_BRANCH is defined, also include header file only when
MARBLE_SUBSURFACE_BRANCH is set.

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Guillaume GARDET 2014-12-17 15:35:29 +01:00 committed by Dirk Hohndel
parent d67cce2af8
commit 1910d6d546
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/globe.cpp
View file

@ -18,7 +18,9 @@
#include <marble/MarbleDirs.h> #include <marble/MarbleDirs.h>
#include <marble/MapThemeManager.h> #include <marble/MapThemeManager.h>
#include <marble/GeoDataLineString.h> #include <marble/GeoDataLineString.h>
#ifdef MARBLE_SUBSURFACE_BRANCH
#include <marble/MarbleDebug.h> #include <marble/MarbleDebug.h>
#endif
#if INCOMPLETE_MARBLE #if INCOMPLETE_MARBLE
#include "marble/GeoDataTreeModel.h" #include "marble/GeoDataTreeModel.h"
#else #else