diff options
| author | Ansis Brammanis <brammanis@gmail.com> | 2015-06-03 19:20:41 -0400 |
|---|---|---|
| committer | Ansis Brammanis <brammanis@gmail.com> | 2015-06-03 19:20:41 -0400 |
| commit | 9c03b396c0a36af28cbaf490c75850af18f780d2 (patch) | |
| tree | 5c4d94933a2d12df30d1ce1af6eb87d27e024402 /test/test.gypi | |
| parent | 2bd7e4550296ce5f58abef93667bb92464317dc9 (diff) | |
| parent | 295dc73c1af288c85e75a4fcaccdd9cb1580afd2 (diff) | |
| download | qtlocation-mapboxgl-9c03b396c0a36af28cbaf490c75850af18f780d2.tar.gz | |
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts:
src/mbgl/renderer/painter_fill.cpp
Diffstat (limited to 'test/test.gypi')
| -rw-r--r-- | test/test.gypi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/test.gypi b/test/test.gypi index 24582df992..0e14ac0835 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -58,11 +58,6 @@ 'miscellaneous/variant.cpp', 'miscellaneous/worker.cpp', - 'resources/mock_file_source.cpp', - 'resources/mock_file_source.hpp', - 'resources/mock_view.hpp', - 'resources/resource_loader.cpp', - 'storage/storage.hpp', 'storage/storage.cpp', 'storage/cache_response.cpp', @@ -78,6 +73,11 @@ 'storage/http_load.cpp', 'storage/http_other_loop.cpp', 'storage/http_reading.cpp', + + 'style/mock_file_source.cpp', + 'style/mock_file_source.hpp', + 'style/mock_view.hpp', + 'style/resource_loading.cpp', ], 'libraries': [ '<@(uv_static_libs)', |