Bump Mapbox GL Nativeqt-v1.1.0

mapbox-gl-native @ edd7948893fcd40a24d96b790e21d3dd028cecbe

1 files changed, 206 insertions, 440 deletions

diff --git a/mapbox-gl-native.pro b/mapbox-gl-native.pro
index 72837f3fb2..7065849d83 100644
--- a/mapbox-gl-native.pro
+++ b/mapbox-gl-native.pro
@@ -8,9 +8,79 @@ QT += network-private \
       gui-private \
       sql-private
 
-# Core Mapbox GL
+QMAKE_CXXFLAGS += \
+    -DNDEBUG \
+    -DQT_IMAGE_DECODERS \
+    -DRAPIDJSON_HAS_STDSTRING=1 \
+    -D__QT__ \
+    -O3 \
+    -ftemplate-depth=1024 \
+    -fvisibility-inlines-hidden \
+    -fvisibility=hidden
+
+android|win32|darwin {
+    SOURCES += \
+        platform/qt/src/thread.cpp
+} else {
+    SOURCES += \
+        platform/default/thread.cpp
+}
+
+darwin {
+    LIBS += \
+        -framework Foundation
+}
+
+win32 {
+    QMAKE_CXXFLAGS += \
+        -D_WINDOWS \
+        -DNOGDI \
+        -DNOMINMAX \
+        -D_USE_MATH_DEFINES
+}
+
+win32:qtConfig(dynamicgl) {
+    QMAKE_CXXFLAGS += \
+        -DMBGL_USE_GLES2 \
+        -DQT_OPENGL_ES_2
+}
+
+qtConfig(opengles2) {
+    QMAKE_CXXFLAGS += \
+        -DMBGL_USE_GLES2
+}
+
+qtConfig(system-zlib) {
+    QMAKE_USE_PRIVATE += zlib
+} else {
+    QT_PRIVATE += zlib-private
+}
+
+# QTBUG-59035
+TR_EXCLUDE += $$PWD/*
+
+qtConfig(icu) {
+    SOURCES += \
+        platform/default/bidi.cpp
+} else {
+    SOURCES += \
+        platform/qt/src/bidi.cpp
+}
+
 SOURCES += \
-    src/clipper/clipper.cpp \
+    platform/qt/src/async_task.cpp \
+    platform/qt/src/http_file_source.cpp \
+    platform/qt/src/http_request.cpp \
+    platform/qt/src/qmapbox.cpp \
+    platform/qt/src/qmapboxgl.cpp \
+    platform/qt/src/qmapboxgl_renderer_frontend_p.cpp \
+    platform/qt/src/qt_image.cpp \
+    platform/qt/src/run_loop.cpp \
+    platform/qt/src/sqlite3.cpp \
+    platform/qt/src/string_stdlib.cpp \
+    platform/qt/src/thread_local.cpp \
+    platform/qt/src/timer.cpp \
+    platform/qt/src/utf.cpp \
     src/csscolorparser/csscolorparser.cpp \
     src/mbgl/actor/mailbox.cpp \
     src/mbgl/algorithm/generate_clip_ids.cpp \
@@ -19,8 +89,8 @@ SOURCES += \
     src/mbgl/annotation/annotation_tile.cpp \
     src/mbgl/annotation/fill_annotation_impl.cpp \
     src/mbgl/annotation/line_annotation_impl.cpp \
+    src/mbgl/annotation/render_annotation_source.cpp \
     src/mbgl/annotation/shape_annotation_impl.cpp \
-    src/mbgl/annotation/style_sourced_annotation_impl.cpp \
     src/mbgl/annotation/symbol_annotation_impl.cpp \
     src/mbgl/geometry/feature_index.cpp \
     src/mbgl/geometry/line_atlas.cpp \
@@ -28,8 +98,8 @@ SOURCES += \
     src/mbgl/gl/color_mode.cpp \
     src/mbgl/gl/context.cpp \
     src/mbgl/gl/debugging.cpp \
+    src/mbgl/gl/debugging_extension.cpp \
     src/mbgl/gl/depth_mode.cpp \
-    src/mbgl/gl/extension.cpp \
     src/mbgl/gl/gl.cpp \
     src/mbgl/gl/object.cpp \
     src/mbgl/gl/stencil_mode.cpp \
@@ -40,45 +110,90 @@ SOURCES += \
     src/mbgl/layout/merge_lines.cpp \
     src/mbgl/layout/symbol_instance.cpp \
     src/mbgl/layout/symbol_layout.cpp \
-    src/mbgl/map/backend.cpp \
+    src/mbgl/layout/symbol_projection.cpp \
     src/mbgl/map/map.cpp \
     src/mbgl/map/transform.cpp \
     src/mbgl/map/transform_state.cpp \
     src/mbgl/math/log2.cpp \
+    src/mbgl/programs/binary_program.cpp \
     src/mbgl/programs/circle_program.cpp \
     src/mbgl/programs/collision_box_program.cpp \
+    src/mbgl/programs/extrusion_texture_program.cpp \
+    src/mbgl/programs/fill_extrusion_program.cpp \
     src/mbgl/programs/fill_program.cpp \
     src/mbgl/programs/line_program.cpp \
+    src/mbgl/programs/program_parameters.cpp \
     src/mbgl/programs/raster_program.cpp \
     src/mbgl/programs/symbol_program.cpp \
-    src/mbgl/renderer/circle_bucket.cpp \
-    src/mbgl/renderer/debug_bucket.cpp \
-    src/mbgl/renderer/fill_bucket.cpp \
+    src/mbgl/renderer/backend_scope.cpp \
+    src/mbgl/renderer/bucket_parameters.cpp \
+    src/mbgl/renderer/buckets/circle_bucket.cpp \
+    src/mbgl/renderer/buckets/debug_bucket.cpp \
+    src/mbgl/renderer/buckets/fill_bucket.cpp \
+    src/mbgl/renderer/buckets/fill_extrusion_bucket.cpp \
+    src/mbgl/renderer/buckets/line_bucket.cpp \
+    src/mbgl/renderer/buckets/raster_bucket.cpp \
+    src/mbgl/renderer/buckets/symbol_bucket.cpp \
+    src/mbgl/renderer/cross_faded_property_evaluator.cpp \
     src/mbgl/renderer/frame_history.cpp \
-    src/mbgl/renderer/line_bucket.cpp \
-    src/mbgl/renderer/painter.cpp \
-    src/mbgl/renderer/painter_background.cpp \
-    src/mbgl/renderer/painter_circle.cpp \
-    src/mbgl/renderer/painter_clipping.cpp \
-    src/mbgl/renderer/painter_debug.cpp \
-    src/mbgl/renderer/painter_fill.cpp \
-    src/mbgl/renderer/painter_line.cpp \
-    src/mbgl/renderer/painter_raster.cpp \
-    src/mbgl/renderer/painter_symbol.cpp \
-    src/mbgl/renderer/raster_bucket.cpp \
+    src/mbgl/renderer/group_by_layout.cpp \
+    src/mbgl/renderer/image_atlas.cpp \
+    src/mbgl/renderer/image_manager.cpp \
+    src/mbgl/renderer/layers/render_background_layer.cpp \
+    src/mbgl/renderer/layers/render_circle_layer.cpp \
+    src/mbgl/renderer/layers/render_custom_layer.cpp \
+    src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp \
+    src/mbgl/renderer/layers/render_fill_layer.cpp \
+    src/mbgl/renderer/layers/render_line_layer.cpp \
+    src/mbgl/renderer/layers/render_raster_layer.cpp \
+    src/mbgl/renderer/layers/render_symbol_layer.cpp \
+    src/mbgl/renderer/paint_parameters.cpp \
+    src/mbgl/renderer/render_layer.cpp \
+    src/mbgl/renderer/render_light.cpp \
+    src/mbgl/renderer/render_source.cpp \
+    src/mbgl/renderer/render_static_data.cpp \
+    src/mbgl/renderer/render_style.cpp \
     src/mbgl/renderer/render_tile.cpp \
-    src/mbgl/renderer/symbol_bucket.cpp \
-    src/mbgl/sprite/sprite_atlas.cpp \
-    src/mbgl/sprite/sprite_image.cpp \
+    src/mbgl/renderer/renderer.cpp \
+    src/mbgl/renderer/renderer_backend.cpp \
+    src/mbgl/renderer/renderer_impl.cpp \
+    src/mbgl/renderer/sources/render_geojson_source.cpp \
+    src/mbgl/renderer/sources/render_image_source.cpp \
+    src/mbgl/renderer/sources/render_raster_source.cpp \
+    src/mbgl/renderer/sources/render_vector_source.cpp \
+    src/mbgl/renderer/style_diff.cpp \
+    src/mbgl/renderer/tile_pyramid.cpp \
+    src/mbgl/shaders/circle.cpp \
+    src/mbgl/shaders/collision_box.cpp \
+    src/mbgl/shaders/debug.cpp \
+    src/mbgl/shaders/extrusion_texture.cpp \
+    src/mbgl/shaders/fill.cpp \
+    src/mbgl/shaders/fill_extrusion.cpp \
+    src/mbgl/shaders/fill_extrusion_pattern.cpp \
+    src/mbgl/shaders/fill_outline.cpp \
+    src/mbgl/shaders/fill_outline_pattern.cpp \
+    src/mbgl/shaders/fill_pattern.cpp \
+    src/mbgl/shaders/line.cpp \
+    src/mbgl/shaders/line_pattern.cpp \
+    src/mbgl/shaders/line_sdf.cpp \
+    src/mbgl/shaders/preludes.cpp \
+    src/mbgl/shaders/raster.cpp \
+    src/mbgl/shaders/shaders.cpp \
+    src/mbgl/shaders/symbol_icon.cpp \
+    src/mbgl/shaders/symbol_sdf.cpp \
+    src/mbgl/sprite/sprite_loader.cpp \
+    src/mbgl/sprite/sprite_loader_worker.cpp \
     src/mbgl/sprite/sprite_parser.cpp \
+    src/mbgl/storage/file_source_request.cpp \
     src/mbgl/storage/network_status.cpp \
     src/mbgl/storage/resource.cpp \
+    src/mbgl/storage/resource_transform.cpp \
     src/mbgl/storage/response.cpp \
-    src/mbgl/style/bucket_parameters.cpp \
-    src/mbgl/style/class_dictionary.cpp \
-    src/mbgl/style/cross_faded_property_evaluator.cpp \
-    src/mbgl/style/function.cpp \
-    src/mbgl/style/group_by_layout.cpp \
+    src/mbgl/style/conversion/geojson.cpp \
+    src/mbgl/style/function/categorical_stops.cpp \
+    src/mbgl/style/function/identity_stops.cpp \
+    src/mbgl/style/image.cpp \
+    src/mbgl/style/image_impl.cpp \
     src/mbgl/style/layer.cpp \
     src/mbgl/style/layer_impl.cpp \
     src/mbgl/style/layers/background_layer.cpp \
@@ -104,18 +219,21 @@ SOURCES += \
     src/mbgl/style/layers/symbol_layer.cpp \
     src/mbgl/style/layers/symbol_layer_impl.cpp \
     src/mbgl/style/layers/symbol_layer_properties.cpp \
+    src/mbgl/style/light.cpp \
+    src/mbgl/style/light_impl.cpp \
     src/mbgl/style/parser.cpp \
-    src/mbgl/style/property_parsing.cpp \
     src/mbgl/style/source.cpp \
     src/mbgl/style/source_impl.cpp \
     src/mbgl/style/sources/geojson_source.cpp \
     src/mbgl/style/sources/geojson_source_impl.cpp \
+    src/mbgl/style/sources/image_source.cpp \
+    src/mbgl/style/sources/image_source_impl.cpp \
     src/mbgl/style/sources/raster_source.cpp \
     src/mbgl/style/sources/raster_source_impl.cpp \
     src/mbgl/style/sources/vector_source.cpp \
     src/mbgl/style/sources/vector_source_impl.cpp \
     src/mbgl/style/style.cpp \
-    src/mbgl/style/tile_source_impl.cpp \
+    src/mbgl/style/style_impl.cpp \
     src/mbgl/style/types.cpp \
     src/mbgl/text/check_max_angle.cpp \
     src/mbgl/text/collision_feature.cpp \
@@ -123,8 +241,8 @@ SOURCES += \
     src/mbgl/text/get_anchors.cpp \
     src/mbgl/text/glyph.cpp \
     src/mbgl/text/glyph_atlas.cpp \
+    src/mbgl/text/glyph_manager.cpp \
     src/mbgl/text/glyph_pbf.cpp \
-    src/mbgl/text/glyph_set.cpp \
     src/mbgl/text/quads.cpp \
     src/mbgl/text/shaping.cpp \
     src/mbgl/tile/geojson_tile.cpp \
@@ -137,6 +255,7 @@ SOURCES += \
     src/mbgl/tile/tile_cache.cpp \
     src/mbgl/tile/tile_id_io.cpp \
     src/mbgl/tile/vector_tile.cpp \
+    src/mbgl/tile/vector_tile_data.cpp \
     src/mbgl/util/chrono.cpp \
     src/mbgl/util/clip_id.cpp \
     src/mbgl/util/color.cpp \
@@ -147,11 +266,12 @@ SOURCES += \
     src/mbgl/util/event.cpp \
     src/mbgl/util/font_stack.cpp \
     src/mbgl/util/geo.cpp \
-    src/mbgl/util/geojson.cpp \
+    src/mbgl/util/geojson_impl.cpp \
     src/mbgl/util/grid_index.cpp \
     src/mbgl/util/http_header.cpp \
     src/mbgl/util/http_timeout.cpp \
     src/mbgl/util/i18n.cpp \
+    src/mbgl/util/interpolate.cpp \
     src/mbgl/util/intersection_tests.cpp \
     src/mbgl/util/io.cpp \
     src/mbgl/util/logging.cpp \
@@ -162,432 +282,78 @@ SOURCES += \
     src/mbgl/util/offscreen_texture.cpp \
     src/mbgl/util/premultiply.cpp \
     src/mbgl/util/stopwatch.cpp \
-    src/mbgl/util/thread_context.cpp \
+    src/mbgl/util/string.cpp \
+    src/mbgl/util/throttler.cpp \
     src/mbgl/util/tile_cover.cpp \
     src/mbgl/util/url.cpp \
-    src/mbgl/util/version_info.cpp \
-    src/mbgl/util/work_queue.cpp \
+    src/mbgl/util/version.cpp \
     src/mbgl/util/work_request.cpp \
-    src/parsedate/parsedate.c
-
-PRIVATE_HEADERS += \
-    include/mbgl/annotation/annotation.hpp \
-    include/mbgl/gl/gl.hpp \
-    include/mbgl/map/backend.hpp \
-    include/mbgl/map/camera.hpp \
-    include/mbgl/map/map.hpp \
-    include/mbgl/map/mode.hpp \
-    include/mbgl/map/view.hpp \
-    include/mbgl/math/clamp.hpp \
-    include/mbgl/math/log2.hpp \
-    include/mbgl/math/minmax.hpp \
-    include/mbgl/math/wrap.hpp \
-    include/mbgl/sprite/sprite_image.hpp \
-    include/mbgl/storage/default_file_source.hpp \
-    include/mbgl/storage/file_source.hpp \
-    include/mbgl/storage/network_status.hpp \
-    include/mbgl/storage/offline.hpp \
-    include/mbgl/storage/online_file_source.hpp \
-    include/mbgl/storage/resource.hpp \
-    include/mbgl/storage/response.hpp \
-    include/mbgl/style/conversion.hpp \
-    include/mbgl/style/conversion/constant.hpp \
-    include/mbgl/style/conversion/filter.hpp \
-    include/mbgl/style/conversion/function.hpp \
-    include/mbgl/style/conversion/geojson.hpp \
-    include/mbgl/style/conversion/geojson_options.hpp \
-    include/mbgl/style/conversion/layer.hpp \
-    include/mbgl/style/conversion/make_property_setters.hpp \
-    include/mbgl/style/conversion/make_property_setters.hpp.ejs \
-    include/mbgl/style/conversion/property_setter.hpp \
-    include/mbgl/style/conversion/property_value.hpp \
-    include/mbgl/style/conversion/source.hpp \
-    include/mbgl/style/conversion/tileset.hpp \
-    include/mbgl/style/filter.hpp \
-    include/mbgl/style/filter_evaluator.hpp \
-    include/mbgl/style/function.hpp \
-    include/mbgl/style/layer.hpp \
-    include/mbgl/style/layers/background_layer.hpp \
-    include/mbgl/style/layers/circle_layer.hpp \
-    include/mbgl/style/layers/custom_layer.hpp \
-    include/mbgl/style/layers/fill_extrusion_layer.hpp \
-    include/mbgl/style/layers/fill_layer.hpp \
-    include/mbgl/style/layers/layer.hpp.ejs \
-    include/mbgl/style/layers/line_layer.hpp \
-    include/mbgl/style/layers/raster_layer.hpp \
-    include/mbgl/style/layers/symbol_layer.hpp \
-    include/mbgl/style/property_value.hpp \
-    include/mbgl/style/source.hpp \
-    include/mbgl/style/sources/geojson_source.hpp \
-    include/mbgl/style/sources/raster_source.hpp \
-    include/mbgl/style/sources/vector_source.hpp \
-    include/mbgl/style/transition_options.hpp \
-    include/mbgl/style/types.hpp \
-    include/mbgl/util/async_request.hpp \
-    include/mbgl/util/char_array_buffer.hpp \
-    include/mbgl/util/chrono.hpp \
-    include/mbgl/util/color.hpp \
-    include/mbgl/util/compression.hpp \
-    include/mbgl/util/constants.hpp \
-    include/mbgl/util/convert.hpp \
-    include/mbgl/util/enum.hpp \
-    include/mbgl/util/event.hpp \
-    include/mbgl/util/exception.hpp \
-    include/mbgl/util/feature.hpp \
-    include/mbgl/util/font_stack.hpp \
-    include/mbgl/util/geo.hpp \
-    include/mbgl/util/geojson.hpp \
-    include/mbgl/util/geometry.hpp \
-    include/mbgl/util/image.hpp \
-    include/mbgl/util/logging.hpp \
-    include/mbgl/util/noncopyable.hpp \
-    include/mbgl/util/optional.hpp \
-    include/mbgl/util/platform.hpp \
-    include/mbgl/util/projection.hpp \
-    include/mbgl/util/range.hpp \
-    include/mbgl/util/run_loop.hpp \
-    include/mbgl/util/size.hpp \
-    include/mbgl/util/string.hpp \
-    include/mbgl/util/tileset.hpp \
-    include/mbgl/util/timer.hpp \
-    include/mbgl/util/traits.hpp \
-    include/mbgl/util/unitbezier.hpp \
-    include/mbgl/util/util.hpp \
-    include/mbgl/util/variant.hpp \
-    include/mbgl/util/version.hpp \
-    include/mbgl/util/work_request.hpp \
-    include/mbgl/util/work_task.hpp \
-    include/mbgl/util/work_task_impl.hpp \
-    src/clipper/clipper.hpp \
-    src/csscolorparser/csscolorparser.hpp \
-    src/mbgl/actor/actor.hpp \
-    src/mbgl/actor/actor_ref.hpp \
-    src/mbgl/actor/mailbox.hpp \
-    src/mbgl/actor/message.hpp \
-    src/mbgl/actor/scheduler.hpp \
-    src/mbgl/algorithm/covered_by_children.hpp \
-    src/mbgl/algorithm/generate_clip_ids.hpp \
-    src/mbgl/algorithm/generate_clip_ids_impl.hpp \
-    src/mbgl/algorithm/update_renderables.hpp \
-    src/mbgl/annotation/annotation_manager.hpp \
-    src/mbgl/annotation/annotation_source.hpp \
-    src/mbgl/annotation/annotation_tile.hpp \
-    src/mbgl/annotation/fill_annotation_impl.hpp \
-    src/mbgl/annotation/line_annotation_impl.hpp \
-    src/mbgl/annotation/shape_annotation_impl.hpp \
-    src/mbgl/annotation/style_sourced_annotation_impl.hpp \
-    src/mbgl/annotation/symbol_annotation_impl.hpp \
-    src/mbgl/geometry/anchor.hpp \
-    src/mbgl/geometry/binpack.hpp \
-    src/mbgl/geometry/debug_font_data.hpp \
-    src/mbgl/geometry/feature_index.hpp \
-    src/mbgl/geometry/line_atlas.hpp \
-    src/mbgl/gl/attribute.hpp \
-    src/mbgl/gl/color_mode.hpp \
-    src/mbgl/gl/context.hpp \
-    src/mbgl/gl/debugging.hpp \
-    src/mbgl/gl/depth_mode.hpp \
-    src/mbgl/gl/draw_mode.hpp \
-    src/mbgl/gl/extension.hpp \
-    src/mbgl/gl/framebuffer.hpp \
-    src/mbgl/gl/index_buffer.hpp \
-    src/mbgl/gl/object.hpp \
-    src/mbgl/gl/primitives.hpp \
-    src/mbgl/gl/program.hpp \
-    src/mbgl/gl/renderbuffer.hpp \
-    src/mbgl/gl/segment.hpp \
-    src/mbgl/gl/state.hpp \
-    src/mbgl/gl/stencil_mode.hpp \
-    src/mbgl/gl/texture.hpp \
-    src/mbgl/gl/types.hpp \
-    src/mbgl/gl/uniform.hpp \
-    src/mbgl/gl/value.hpp \
-    src/mbgl/gl/vertex_array.hpp \
-    src/mbgl/gl/vertex_buffer.hpp \
-    src/mbgl/layout/clip_lines.hpp \
-    src/mbgl/layout/merge_lines.hpp \
-    src/mbgl/layout/symbol_feature.hpp \
-    src/mbgl/layout/symbol_instance.hpp \
-    src/mbgl/layout/symbol_layout.hpp \
-    src/mbgl/map/change.hpp \
-    src/mbgl/map/transform.hpp \
-    src/mbgl/map/transform_state.hpp \
-    src/mbgl/map/update.hpp \
-    src/mbgl/map/zoom_history.hpp \
-    src/mbgl/programs/attributes.hpp \
-    src/mbgl/programs/circle_program.hpp \
-    src/mbgl/programs/collision_box_program.hpp \
-    src/mbgl/programs/debug_program.hpp \
-    src/mbgl/programs/fill_program.hpp \
-    src/mbgl/programs/line_program.hpp \
-    src/mbgl/programs/program.hpp \
-    src/mbgl/programs/program_parameters.hpp \
-    src/mbgl/programs/programs.hpp \
-    src/mbgl/programs/raster_program.hpp \
-    src/mbgl/programs/symbol_program.hpp \
-    src/mbgl/programs/uniforms.hpp \
-    src/mbgl/renderer/bucket.hpp \
-    src/mbgl/renderer/circle_bucket.hpp \
-    src/mbgl/renderer/debug_bucket.hpp \
-    src/mbgl/renderer/fill_bucket.hpp \
-    src/mbgl/renderer/frame_history.hpp \
-    src/mbgl/renderer/line_bucket.hpp \
-    src/mbgl/renderer/paint_parameters.hpp \
-    src/mbgl/renderer/painter.hpp \
-    src/mbgl/renderer/raster_bucket.hpp \
-    src/mbgl/renderer/render_item.hpp \
-    src/mbgl/renderer/render_pass.hpp \
-    src/mbgl/renderer/render_tile.hpp \
-    src/mbgl/renderer/symbol_bucket.hpp \
-    src/mbgl/sprite/sprite_atlas.hpp \
-    src/mbgl/sprite/sprite_atlas_observer.hpp \
-    src/mbgl/sprite/sprite_parser.hpp \
-    src/mbgl/storage/asset_file_source.hpp \
-    src/mbgl/storage/http_file_source.hpp \
-    src/mbgl/storage/local_file_source.hpp \
-    src/mbgl/style/bucket_parameters.hpp \
-    src/mbgl/style/cascade_parameters.hpp \
-    src/mbgl/style/class_dictionary.hpp \
-    src/mbgl/style/conversion/stringify.hpp \
-    src/mbgl/style/cross_faded_property_evaluator.hpp \
-    src/mbgl/style/group_by_layout.hpp \
-    src/mbgl/style/layer_impl.hpp \
-    src/mbgl/style/layer_observer.hpp \
-    src/mbgl/style/layers/background_layer_impl.hpp \
-    src/mbgl/style/layers/background_layer_properties.hpp \
-    src/mbgl/style/layers/circle_layer_impl.hpp \
-    src/mbgl/style/layers/circle_layer_properties.hpp \
-    src/mbgl/style/layers/custom_layer_impl.hpp \
-    src/mbgl/style/layers/fill_extrusion_layer_impl.hpp \
-    src/mbgl/style/layers/fill_extrusion_layer_properties.hpp \
-    src/mbgl/style/layers/fill_layer_impl.hpp \
-    src/mbgl/style/layers/fill_layer_properties.hpp \
-    src/mbgl/style/layers/line_layer_impl.hpp \
-    src/mbgl/style/layers/line_layer_properties.hpp \
-    src/mbgl/style/layers/raster_layer_impl.hpp \
-    src/mbgl/style/layers/raster_layer_properties.hpp \
-    src/mbgl/style/layers/symbol_layer_impl.hpp \
-    src/mbgl/style/layers/symbol_layer_properties.hpp \
-    src/mbgl/style/layout_property.hpp \
-    src/mbgl/style/observer.hpp \
-    src/mbgl/style/paint_property.hpp \
-    src/mbgl/style/parser.hpp \
-    src/mbgl/style/property_evaluation_parameters.hpp \
-    src/mbgl/style/property_evaluator.hpp \
-    src/mbgl/style/property_parsing.hpp \
-    src/mbgl/style/query_parameters.hpp \
-    src/mbgl/style/rapidjson_conversion.hpp \
-    src/mbgl/style/source_impl.hpp \
-    src/mbgl/style/source_observer.hpp \
-    src/mbgl/style/sources/geojson_source_impl.hpp \
-    src/mbgl/style/sources/raster_source_impl.hpp \
-    src/mbgl/style/sources/vector_source_impl.hpp \
-    src/mbgl/style/style.hpp \
-    src/mbgl/style/tile_source_impl.hpp \
-    src/mbgl/style/update_batch.hpp \
-    src/mbgl/style/update_parameters.hpp \
-    src/mbgl/text/bidi.hpp \
-    src/mbgl/text/check_max_angle.hpp \
-    src/mbgl/text/collision_feature.hpp \
-    src/mbgl/text/collision_tile.hpp \
-    src/mbgl/text/get_anchors.hpp \
-    src/mbgl/text/glyph.hpp \
-    src/mbgl/text/glyph_atlas.hpp \
-    src/mbgl/text/glyph_atlas_observer.hpp \
-    src/mbgl/text/glyph_pbf.hpp \
-    src/mbgl/text/glyph_range.hpp \
-    src/mbgl/text/glyph_set.hpp \
-    src/mbgl/text/placement_config.hpp \
-    src/mbgl/text/quads.hpp \
-    src/mbgl/text/shaping.hpp \
-    src/mbgl/tile/geojson_tile.hpp \
-    src/mbgl/tile/geometry_tile.hpp \
-    src/mbgl/tile/geometry_tile_data.hpp \
-    src/mbgl/tile/geometry_tile_worker.hpp \
-    src/mbgl/tile/raster_tile.hpp \
-    src/mbgl/tile/raster_tile_worker.hpp \
-    src/mbgl/tile/tile.hpp \
-    src/mbgl/tile/tile_cache.hpp \
-    src/mbgl/tile/tile_id.hpp \
-    src/mbgl/tile/tile_loader.hpp \
-    src/mbgl/tile/tile_loader_impl.hpp \
-    src/mbgl/tile/tile_observer.hpp \
-    src/mbgl/tile/vector_tile.hpp \
-    src/mbgl/util/async_task.hpp \
-    src/mbgl/util/clip_id.hpp \
-    src/mbgl/util/dtoa.hpp \
-    src/mbgl/util/exclusive.hpp \
-    src/mbgl/util/grid_index.hpp \
-    src/mbgl/util/http_header.hpp \
-    src/mbgl/util/http_timeout.hpp \
-    src/mbgl/util/i18n.hpp \
-    src/mbgl/util/ignore.hpp \
-    src/mbgl/util/indexed_tuple.hpp \
-    src/mbgl/util/interpolate.hpp \
-    src/mbgl/util/intersection_tests.hpp \
-    src/mbgl/util/io.hpp \
-    src/mbgl/util/mapbox.hpp \
-    src/mbgl/util/mat2.hpp \
-    src/mbgl/util/mat3.hpp \
-    src/mbgl/util/mat4.hpp \
-    src/mbgl/util/math.hpp \
-    src/mbgl/util/offscreen_texture.hpp \
-    src/mbgl/util/premultiply.hpp \
-    src/mbgl/util/rapidjson.hpp \
-    src/mbgl/util/rect.hpp \
-    src/mbgl/util/std.hpp \
-    src/mbgl/util/stopwatch.hpp \
-    src/mbgl/util/thread.hpp \
-    src/mbgl/util/thread_context.hpp \
-    src/mbgl/util/thread_local.hpp \
-    src/mbgl/util/tile_coordinate.hpp \
-    src/mbgl/util/tile_cover.hpp \
-    src/mbgl/util/token.hpp \
-    src/mbgl/util/url.hpp \
-    src/mbgl/util/utf.hpp \
-    src/mbgl/util/work_queue.hpp
-
-# Qt bindings
-SOURCES += \
-    platform/default/asset_file_source.cpp \
-    platform/default/default_file_source.cpp \
-    platform/default/local_file_source.cpp \
-    platform/default/logging_stderr.cpp \
-    platform/default/mbgl/storage/offline.cpp \
-    platform/default/mbgl/storage/offline_database.cpp \
-    platform/default/mbgl/storage/offline_download.cpp \
-    platform/default/mbgl/util/default_styles.cpp \
-    platform/default/mbgl/util/default_thread_pool.cpp \
-    platform/default/online_file_source.cpp \
-    platform/qt/src/async_task.cpp \
-    platform/qt/src/http_file_source.cpp \
-    platform/qt/src/http_request.cpp \
-    platform/qt/src/image.cpp \
-    platform/qt/src/qmapbox.cpp \
-    platform/qt/src/qmapboxgl.cpp \
-    platform/qt/src/run_loop.cpp \
-    platform/qt/src/sqlite3.cpp \
-    platform/qt/src/string_stdlib.cpp \
-    platform/qt/src/thread_local.cpp \
-    platform/qt/src/timer.cpp \
-    platform/qt/src/utf.cpp
+    src/parsedate/parsedate.c \
+	platform/default/asset_file_source.cpp \
+	platform/default/default_file_source.cpp \
+	platform/default/local_file_source.cpp \
+	platform/default/online_file_source.cpp \
+	platform/default/mbgl/storage/offline.cpp \
+	platform/default/mbgl/storage/offline_database.cpp \
+	platform/default/mbgl/storage/offline_download.cpp \
+	platform/default/logging_stderr.cpp \
+	platform/default/mbgl/util/shared_thread_pool.cpp \
+	platform/default/mbgl/util/default_thread_pool.cpp
 
 HEADERS += \
-    platform/default/mbgl/storage/offline_database.hpp \
-    platform/default/mbgl/storage/offline_download.hpp \
-    platform/default/mbgl/util/default_styles.hpp \
-    platform/default/mbgl/util/default_thread_pool.hpp \
-    platform/default/sqlite3.hpp \
-    platform/qt/include/qmapbox.hpp \ \
+    platform/qt/include/qmapbox.hpp \
     platform/qt/include/qmapboxgl.hpp \
     platform/qt/src/async_task_impl.hpp \
     platform/qt/src/http_file_source.hpp \
     platform/qt/src/http_request.hpp \
     platform/qt/src/qmapboxgl_p.hpp \
+    platform/qt/src/qmapboxgl_renderer_frontend_p.hpp \
     platform/qt/src/qt_conversion.hpp \
     platform/qt/src/qt_geojson.hpp \
     platform/qt/src/run_loop_impl.hpp \
-    platform/qt/src/timer_impl.hpp
+    platform/qt/src/timer_impl.hpp \
 
 INCLUDEPATH += \
+    deps/any/8fef1e9 \
+    deps/any/8fef1e9/include \
+    deps/boost/1.62.0 \
+    deps/boost/1.62.0/include \
+    deps/cheap-ruler/2.5.3 \
+    deps/cheap-ruler/2.5.3/include \
+    deps/earcut/0.12.3 \
+    deps/earcut/0.12.3/include \
+    deps/geojson/0.4.0 \
+    deps/geojson/0.4.0/include \
+    deps/geojsonvt/6.2.1 \
+    deps/geojsonvt/6.2.1/include \
+    deps/geometry/0.9.2 \
+    deps/geometry/0.9.2/include \
+    deps/kdbush/0.1.1-1 \
+    deps/kdbush/0.1.1-1/include \
+    deps/pixelmatch/0.10.0 \
+    deps/pixelmatch/0.10.0/include \
+    deps/polylabel/1.0.3 \
+    deps/polylabel/1.0.3/include \
+    deps/protozero/1.5.2 \
+    deps/protozero/1.5.2/include \
+    deps/rapidjson/1.1.0 \
+    deps/rapidjson/1.1.0/include \
+    deps/shelf-pack/2.1.1 \
+    deps/shelf-pack/2.1.1/include \
+    deps/supercluster/0.2.2 \
+    deps/supercluster/0.2.2/include \
+    deps/unique_resource/cba309e \
+    deps/unique_resource/cba309e/include \
+    deps/variant/1.1.4 \
+    deps/variant/1.1.4/include \
+    deps/vector-tile/1.0.0-rc7 \
+    deps/vector-tile/1.0.0-rc7/include \
+    deps/wagyu/0.4.3 \
+    deps/wagyu/0.4.3/include \
     include \
     platform/default \
     platform/qt/include \
-    src \
-    src/3rd_party/earcut \
-    src/3rd_party/earcut/include \
-    src/3rd_party/geojson-cpp \
-    src/3rd_party/geojson-cpp/include \
-    src/3rd_party/geojson-vt-cpp \
-    src/3rd_party/geojson-vt-cpp/include \
-    src/3rd_party/geometry.hpp \
-    src/3rd_party/geometry.hpp/include \
-    src/3rd_party/kdbush.hpp \
-    src/3rd_party/kdbush.hpp/include \
-    src/3rd_party/libboost \
-    src/3rd_party/libboost/include \
-    src/3rd_party/mapbox-gl-shaders \
-    src/3rd_party/mapbox-gl-shaders/include \
-    src/3rd_party/optional \
-    src/3rd_party/optional/include \
-    src/3rd_party/polylabel \
-    src/3rd_party/polylabel/include \
-    src/3rd_party/protozero \
-    src/3rd_party/protozero/include \
-    src/3rd_party/rapidjson \
-    src/3rd_party/rapidjson/include \
-    src/3rd_party/stamps \
-    src/3rd_party/stamps/include \
-    src/3rd_party/supercluster.hpp \
-    src/3rd_party/supercluster.hpp/include \
-    src/3rd_party/unique_resource \
-    src/3rd_party/unique_resource/include \
-    src/3rd_party/variant \
-    src/3rd_party/variant/include
+    src
 
 QMAKE_CXXFLAGS += \
-    -DNDEBUG \
-    -DQT_IMAGE_DECODERS \
-    -DRAPIDJSON_HAS_STDSTRING=1 \
-    -D__QT__ \
-    -O3 \
-    -ftemplate-depth=1024 \
-    -fvisibility-inlines-hidden \
-    -fvisibility=hidden
-
-linux {
-    android {
-        SOURCES += \
-            platform/qt/src/thread.cpp
-    } else {
-        SOURCES += \
-            platform/default/thread.cpp
-    }
-}
-
-darwin {
-    SOURCES += \
-        platform/darwin/src/nsthread.mm
-
-    LIBS += \
-        -framework Foundation
-}
-
-win32 {
-    SOURCES += \
-        platform/qt/src/thread.cpp
-
-    QMAKE_CXXFLAGS += \
-        -D_WINDOWS \
-        -DNOGDI \
-        -DNOMINMAX \
-        -D_USE_MATH_DEFINES
-}
-
-win32:qtConfig(dynamicgl) {
-    QMAKE_CXXFLAGS += \
-        -DMBGL_USE_GLES2 \
-        -DQT_OPENGL_ES_2
-}
-
-qtConfig(opengles2) {
-    QMAKE_CXXFLAGS += \
-        -DMBGL_USE_GLES2
-}
-
-qtConfig(system-zlib) {
-    QMAKE_USE_PRIVATE += zlib
-} else {
-    QT_PRIVATE += zlib-private
-}
-
-# QTBUG-59035
-TR_EXCLUDE += $$PWD/*
-
-qtConfig(icu) {
-    SOURCES += \
-        platform/default/bidi.cpp
-} else {
-    SOURCES += \
-        platform/qt/src/bidi.cpp
-}
+    -DMBGL_VERSION_REV=\\\"qt-v1.1.0\\\"