summaryrefslogtreecommitdiffstats
path: root/qt-ui/globe.cpp
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2014-12-16 07:06:22 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-12-16 07:06:22 -0800
commitbceff788fbf390335e1b155f8da25aa49ace5f12 (patch)
treeb77bc4323fc82a3d53b901dbde260271d0d9b7b0 /qt-ui/globe.cpp
parentda16258d61e2f2ed9fade335cc56d7e98aa9008b (diff)
downloadsubsurface-bceff788fbf390335e1b155f8da25aa49ace5f12.tar.gz
Only setup marble debug output when comiling against our branch
Otherwise this might break the compile. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/globe.cpp')
-rw-r--r--qt-ui/globe.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp
index fb549cdd4..0f17f32fa 100644
--- a/qt-ui/globe.cpp
+++ b/qt-ui/globe.cpp
@@ -41,6 +41,11 @@ GlobeGPS::GlobeGPS(QWidget *parent) : MarbleWidget(parent),
needResetZoom(false),
editingDiveLocation(false)
{
+#ifdef MARBLE_SUBSURFACE_BRANCH
+ // we need to make sure this gets called after the command line arguments have
+ // been processed but before we initialize the rest of Marble
+ Marble::MarbleDebug::setEnabled(verbose);
+#endif
// check if Google Sat Maps are installed
// if not, check if they are in a known location
MapThemeManager mtm;
@@ -85,7 +90,6 @@ GlobeGPS::GlobeGPS(QWidget *parent) : MarbleWidget(parent),
connect(fixZoomTimer, SIGNAL(timeout()), this, SLOT(fixZoom()));
fixZoomTimer->setSingleShot(true);
installEventFilter(this);
- Marble::MarbleDebug::setEnabled(verbose);
}
bool GlobeGPS::eventFilter(QObject *obj, QEvent *ev)