[PATCH] Fix compilation with upstream Marble
Guillaume GARDET
guillaume.gardet at free.fr
Wed Dec 17 06:35:29 PST 2014
<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 at free.fr>
---
qt-ui/globe.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp
index 0f17f32..bbdf197 100644
--- a/qt-ui/globe.cpp
+++ b/qt-ui/globe.cpp
@@ -18,7 +18,9 @@
#include <marble/MarbleDirs.h>
#include <marble/MapThemeManager.h>
#include <marble/GeoDataLineString.h>
+#ifdef MARBLE_SUBSURFACE_BRANCH
#include <marble/MarbleDebug.h>
+#endif
#if INCOMPLETE_MARBLE
#include "marble/GeoDataTreeModel.h"
#else
--
1.8.4.5
More information about the subsurface
mailing list