BingMap: compatible QtWebEngine + small corrections

This commit is contained in:
grauser
2016-03-24 00:50:17 +01:00
parent 4a3005d3bb
commit bd65436b6b
4 changed files with 171 additions and 49 deletions

View File

@@ -52,9 +52,9 @@
#include "WorkoutPlotWindow.h"
#include "WorkoutWindow.h"
#ifndef NOWEBKIT
#include "BingMap.h"
#include "RideWindow.h"
#endif
#include "BingMap.h"
#include "GoogleMapControl.h"
// Not until v4.0
//#include "RouteWindow.h"
@@ -203,17 +203,17 @@ GcWindowRegistry::newGcWindow(GcWinID id, Context *context)
case GcWindowTypes::SpinScanPlot: returning = new SpinScanPlotWindow(context); break;
case GcWindowTypes::WorkoutPlot: returning = new WorkoutPlotWindow(context); break;
#ifdef NOWEBKIT
case GcWindowTypes::BingMap:
case GcWindowTypes::MapWindow:
case GcWindowTypes::StreetViewWindow:
returning = new GcWindow(); break;
break;
#else
case GcWindowTypes::BingMap: returning = new BingMap(context); break;
case GcWindowTypes::MapWindow: returning = new MapWindow(context); break;
case GcWindowTypes::StreetViewWindow: returning = new StreetViewWindow(context); break;
#endif
case GcWindowTypes::GoogleMap: returning = new GoogleMapControl(context); break;
case GcWindowTypes::BingMap: returning = new BingMap(context); break;
case GcWindowTypes::ActivityNavigator: returning = new RideNavigator(context); break;
case GcWindowTypes::WorkoutWindow: returning = new WorkoutWindow(context); break;
#if 0 // not till v4.0