From b0b5f701fcda276d1ff1c7a181b2ac017f2485c8 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 15 Jul 2017 01:09:23 +0300 Subject: 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 --- desktop-widgets/mainwindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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(); -- cgit v1.2.3-70-g09d2