diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-05-04 11:35:34 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-05-04 11:37:23 -0700 |
| commit | 8f657ff775ff2661350b6ed6c8f44165a0e22dbc (patch) | |
| tree | 2f6409ecc28a668f79cfa0156fc0c715424c351e /qt-ui/globe.cpp | |
| parent | 088017f67c7b404257212b2fed13d97c63ff93b1 (diff) | |
| download | subsurface-8f657ff775ff2661350b6ed6c8f44165a0e22dbc.tar.gz | |
Add conditional so globe.cpp builds with older versions of Marble
In commit 7f3b487c77c7 ("Restore the previous globe zoom level after
showing dive without GPS") I was a bit too aggressive in replacing a
deprecated API function - people still need to be able to compile against
Marble versions older than 4.10.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/globe.cpp')
| -rw-r--r-- | qt-ui/globe.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp index 8f519cf94..275d7ee85 100644 --- a/qt-ui/globe.cpp +++ b/qt-ui/globe.cpp @@ -26,6 +26,12 @@ #include <QMouseEvent> #include <QMessageBox> +// as of Marble 4.10 (which has MARBLE_VERSION 0x001000) zoomView is +// deprecated and has been replaced by setZoom with the same function signature +#if MARBLE_VERSION < 0x001000 +#define setZoom zoomView +#endif + GlobeGPS::GlobeGPS(QWidget *parent) : MarbleWidget(parent), loadedDives(0), messageWidget(new KMessageWidget(this)), |