diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-01-02 16:36:26 -0400 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-01-04 17:27:41 -0400 |
commit | 963dd5e567362b9bf9448d7d2da746d6892a91b2 (patch) | |
tree | b9a585352f5c677f1256ef08df6fd90de689ea37 /platform/qt/src/qmapboxgl_map_renderer.cpp | |
parent | 513b50eee80cb72fe38fd42dd99527c3b6ef7800 (diff) | |
download | qtlocation-mapboxgl-963dd5e567362b9bf9448d7d2da746d6892a91b2.tar.gz |
[Qt] Support local font family in QMapboxGLSettings
Diffstat (limited to 'platform/qt/src/qmapboxgl_map_renderer.cpp')
-rw-r--r-- | platform/qt/src/qmapboxgl_map_renderer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/qt/src/qmapboxgl_map_renderer.cpp b/platform/qt/src/qmapboxgl_map_renderer.cpp index 8c554dab7e..31b518e6d0 100644 --- a/platform/qt/src/qmapboxgl_map_renderer.cpp +++ b/platform/qt/src/qmapboxgl_map_renderer.cpp @@ -25,8 +25,9 @@ static auto *getScheduler() { }; QMapboxGLMapRenderer::QMapboxGLMapRenderer(qreal pixelRatio, - mbgl::DefaultFileSource &fs, mbgl::ThreadPool &tp, QMapboxGLSettings::GLContextMode mode) - : m_renderer(std::make_unique<mbgl::Renderer>(m_backend, pixelRatio, fs, tp, static_cast<mbgl::GLContextMode>(mode))) + mbgl::DefaultFileSource &fs, mbgl::ThreadPool &tp, QMapboxGLSettings::GLContextMode mode, const QString &localFontFamily) + : m_renderer(std::make_unique<mbgl::Renderer>(m_backend, pixelRatio, fs, tp, static_cast<mbgl::GLContextMode>(mode), mbgl::optional<std::string> {}, + localFontFamily.isEmpty() ? mbgl::nullopt : mbgl::optional<std::string> { localFontFamily.toStdString() })) , m_forceScheduler(needsToForceScheduler()) { // If we don't have a Scheduler on this thread, which |