mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 20:43:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only setup marble debug output when comiling against our branch

Browse source 
Otherwise this might break the compile.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-12-16 07:06:22 -08:00
parent da16258d61
commit bceff788fb
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qt-ui/globe.cpp
View file

@ -41,6 +41,11 @@ GlobeGPS::GlobeGPS(QWidget *parent) : MarbleWidget(parent),
needResetZoom(false), needResetZoom(false),
editingDiveLocation(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 // check if Google Sat Maps are installed
// if not, check if they are in a known location // if not, check if they are in a known location
MapThemeManager mtm; MapThemeManager mtm;
@ -85,7 +90,6 @@ GlobeGPS::GlobeGPS(QWidget *parent) : MarbleWidget(parent),
connect(fixZoomTimer, SIGNAL(timeout()), this, SLOT(fixZoom())); connect(fixZoomTimer, SIGNAL(timeout()), this, SLOT(fixZoom()));
fixZoomTimer->setSingleShot(true); fixZoomTimer->setSingleShot(true);
installEventFilter(this); installEventFilter(this);
Marble::MarbleDebug::setEnabled(verbose);
} }
bool GlobeGPS::eventFilter(QObject *obj, QEvent *ev) bool GlobeGPS::eventFilter(QObject *obj, QEvent *ev)