diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2017-07-15 01:09:23 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-28 07:31:11 -0700 |
| commit | b0b5f701fcda276d1ff1c7a181b2ac017f2485c8 (patch) | |
| tree | c6939cbd54e41406f762bf634996fa7870956001 /desktop-widgets | |
| parent | 0f0a953727db5a63e03956c493261c03dc6be2f2 (diff) | |
| download | subsurface-b0b5f701fcda276d1ff1c7a181b2ac017f2485c8.tar.gz | |
mainwindow: create an instance of MapWidget for NO_MARBLE
This is an attempt for a smooth transition between Marble
and Qt Location map integration. If NO_MARBLE is defined
an instance of MapWidget (Qt Location) is created,
else an instance of the Marble widget would be used.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 8e7620d7a..592f9e3f0 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -63,6 +63,8 @@ #include "plugins/facebook/facebookconnectwidget.h" #endif +#include "desktop-widgets/mapwidget.h" + QProgressDialog *progressDialog = NULL; bool progressDialogCanceled = false; @@ -106,7 +108,7 @@ MainWindow::MainWindow() : QMainWindow(), #ifndef NO_MARBLE GlobeGPS *mapWidget = GlobeGPS::instance(); #else - QWidget *mapWidget = NULL; + MapWidget *mapWidget = MapWidget::instance(); #endif PlannerSettingsWidget *plannerSettings = new PlannerSettingsWidget(); |