FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable building with NO_MARBLE again

Browse Source 
This was broken in commit 7efa92406794 ("Transform GlobeGPS in a static
instance() class").

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-07-31 11:01:16 -07:00
parent 21d8d26da1
commit 3efafd1fde
2 changed files with 8 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

@ -390,6 +390,12 @@ void GlobeGPS::centerOnIndex(const QModelIndex& idx)
}
#else
GlobeGPS *GlobeGPS::instance()
{
static GlobeGPS *self = new GlobeGPS();
return self;
}
GlobeGPS::GlobeGPS(QWidget *parent)
{
setText("MARBLE DISABLED AT BUILD TIME");

3
qt-ui/globe.h
View File

@ -63,7 +63,8 @@ slots:
class GlobeGPS : public QLabel {
Q_OBJECT
public:
GlobeGPS(QWidget *parent);
GlobeGPS(QWidget *parent = 0);
static GlobeGPS *instance();
void reload();
void repopulateLabels();
void centerOnDiveSite(uint32_t uuid);