diff options
| author | Randall Lee <randall.lee@mapbox.com> | 2018-05-22 14:09:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 14:09:36 -0400 |
| commit | d858cb783b499a1cc77b48a0faee137ca5e6a423 (patch) | |
| tree | 5c36c353730e3050d44e472545519c0429723266 /platform/qt/app | |
| parent | f93d722458be62d567aa152711a014ef51a90193 (diff) | |
| parent | 60505b03174b5ec02ae723beafa7683f6ed54a62 (diff) | |
| download | qtlocation-mapboxgl-upstream/rclee-async-setup.tar.gz | |
Merge branch 'master' into rclee-async-setupupstream/rclee-async-setup
Diffstat (limited to 'platform/qt/app')
| -rw-r--r-- | platform/qt/app/mapwindow.cpp | 7 | ||||
| -rw-r--r-- | platform/qt/app/mapwindow.hpp | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/platform/qt/app/mapwindow.cpp b/platform/qt/app/mapwindow.cpp index f6d5473192..390d89915a 100644 --- a/platform/qt/app/mapwindow.cpp +++ b/platform/qt/app/mapwindow.cpp @@ -22,6 +22,13 @@ MapWindow::MapWindow(const QMapboxGLSettings &settings) setWindowIcon(QIcon(":icon.png")); } +MapWindow::~MapWindow() +{ + // Make sure we have a valid context so we + // can delete the QMapboxGL. + makeCurrent(); +} + void MapWindow::selfTest() { if (m_bearingAnimation) { diff --git a/platform/qt/app/mapwindow.hpp b/platform/qt/app/mapwindow.hpp index c484114ec0..6c05f03562 100644 --- a/platform/qt/app/mapwindow.hpp +++ b/platform/qt/app/mapwindow.hpp @@ -29,6 +29,7 @@ class MapWindow : public QGLWidget public: MapWindow(const QMapboxGLSettings &); + ~MapWindow(); void selfTest(); |