From 3a03829cb854c299da220a073cae58614d72c5cb Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 26 Apr 2018 10:43:05 -0700 Subject: Fix build with clang The code uses both deprecated C++98 std::auto_ptr and C++14 TR std::experimental::optional and thus depends rather heavily on being compiled with an exact C++ version. Task-number: QTBUG-67810 Change-Id: I599b4a16f93ded6a9fb8fcf24c43c25f83a9f2fd Reviewed-by: Simon Hausmann --- .gitmodules | 2 +- src/3rdparty/mapbox-gl-native | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index a5343bfd..22c3849d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "src/3rdparty/mapbox-gl-native"] path = src/3rdparty/mapbox-gl-native url = ../qtlocation-mapboxgl.git - branch = upstream/qt-staging + branch = upstream/qt-staging-5.11.0 diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native index 8c1be4ec..74df5203 160000 --- a/src/3rdparty/mapbox-gl-native +++ b/src/3rdparty/mapbox-gl-native @@ -1 +1 @@ -Subproject commit 8c1be4ec01ef46bf453856531ebf53b48ce3dbe7 +Subproject commit 74df5203628b47931b4edcb5e8fe352f40fe7df4 -- cgit v1.2.1