diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-04-26 10:43:05 -0700 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-04-29 16:17:52 +0000 |
| commit | 3a03829cb854c299da220a073cae58614d72c5cb (patch) | |
| tree | 48cb32754249ce68e7bb84787fd51c72214fc077 | |
| parent | 3a6335f13aee6461b98375cea235a592456a5ce5 (diff) | |
| download | qtlocation-3a03829cb854c299da220a073cae58614d72c5cb.tar.gz | |
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 <simon.hausmann@qt.io>
| -rw-r--r-- | .gitmodules | 2 | ||||
| m--------- | src/3rdparty/mapbox-gl-native | 0 |
2 files changed, 1 insertions, 1 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 -Subproject 8c1be4ec01ef46bf453856531ebf53b48ce3dbe +Subproject 74df5203628b47931b4edcb5e8fe352f40fe7df |