diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-08-12 13:16:20 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-08-12 13:16:20 +0200 |
| commit | 9b9ad20a90f55ffb31bad71d724845d9e5511a4f (patch) | |
| tree | 5bd92a12f93b75f6d70df6e18bbcb29e838ecca0 /test | |
| parent | fae1c157f6fe15097bb3ca663dd62775ed608622 (diff) | |
| parent | bdfc1036d3b0148fa0f57a277f7686b4b38e2071 (diff) | |
| download | qtlocation-mapboxgl-9b9ad20a90f55ffb31bad71d724845d9e5511a4f.tar.gz | |
Merge branch 'master' into style-parser-test
Conflicts:
mapboxgl.gyp
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures/fixture_request.cpp | 2 | ||||
| -rw-r--r-- | test/test.gyp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/test/fixtures/fixture_request.cpp b/test/fixtures/fixture_request.cpp index b73020590c..1a7ed2ccc3 100644 --- a/test/fixtures/fixture_request.cpp +++ b/test/fixtures/fixture_request.cpp @@ -1,6 +1,6 @@ #include <mbgl/platform/platform.hpp> #include <mbgl/platform/request.hpp> -#include <mbgl/util/uv.hpp> +#include <mbgl/util/uv_detail.hpp> #include <mbgl/platform/log.hpp> const std::string base_directory = []{ diff --git a/test/test.gyp b/test/test.gyp index 3bf8b5b335..07709ecc86 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -208,7 +208,6 @@ "dependencies": [ "../deps/gtest/gtest.gyp:gtest", "../mapboxgl.gyp:mapboxgl", - '../mapboxgl.gyp:bundle_styles', "link_gl", ] }, |