summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmake/core-files.cmake2
-rw-r--r--platform/qt/qt.cmake2
-rw-r--r--platform/qt/src/qt_image.cpp (renamed from platform/qt/src/image.cpp)0
-rw-r--r--src/mbgl/util/geojson_impl.cpp (renamed from src/mbgl/util/geojson.cpp)0
4 files changed, 2 insertions, 2 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake
index d9bd3f79cb..4822c395a1 100644
--- a/cmake/core-files.cmake
+++ b/cmake/core-files.cmake
@@ -584,7 +584,7 @@ set(MBGL_CORE_FILES
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/grid_index.hpp
src/mbgl/util/http_header.cpp
diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake
index 0e9bbbb576..489ae5ed08 100644
--- a/platform/qt/qt.cmake
+++ b/platform/qt/qt.cmake
@@ -46,7 +46,7 @@ set(MBGL_QT_FILES
PRIVATE platform/qt/src/http_file_source.hpp
PRIVATE platform/qt/src/http_request.cpp
PRIVATE platform/qt/src/http_request.hpp
- PRIVATE platform/qt/src/image.cpp
+ PRIVATE platform/qt/src/qt_image.cpp
PRIVATE platform/qt/src/run_loop.cpp
PRIVATE platform/qt/src/run_loop_impl.hpp
PRIVATE platform/qt/src/sqlite3.cpp
diff --git a/platform/qt/src/image.cpp b/platform/qt/src/qt_image.cpp
index 403ca9cbd3..403ca9cbd3 100644
--- a/platform/qt/src/image.cpp
+++ b/platform/qt/src/qt_image.cpp
diff --git a/src/mbgl/util/geojson.cpp b/src/mbgl/util/geojson_impl.cpp
index d1608e09fe..d1608e09fe 100644
--- a/src/mbgl/util/geojson.cpp
+++ b/src/mbgl/util/geojson_impl.cpp