mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix building with NO_MARBLE issue

Browse source 
We can't build with -DNO_MARBLE after some previous commit broke
globe.cpp

- centerOnCurrentDive() is still existing in the code while removed from
header in 6b81fb49d0.

- Some referenced to MainWindow::instance()->globe() even if we are
building with no marble.

- include stdint.h

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Gehad elrobey 2015-06-09 10:19:52 +02:00 • committed by Dirk Hohndel
parent d9801b67b4
commit d88da53586
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
qt-ui/globe.h
View file

@ -1,8 +1,9 @@
#ifndef GLOBE_H
#define GLOBE_H
#ifndef NO_MARBLE
#include <stdint.h>
#ifndef NO_MARBLE
#include <marble/MarbleWidget.h>
#include <marble/GeoDataCoordinates.h>
@ -64,6 +65,7 @@ public:
void reload();
void repopulateLabels();
void centerOnDiveSite(uint32_t uuid);
void centerOnCurrentDive();
bool eventFilter(QObject *, QEvent *);
public
slots: