summaryrefslogtreecommitdiff
path: root/platform/qt
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2017-07-19 13:52:21 +0300
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2017-07-19 14:39:39 +0300
commita3244421a54660a699c669988943035b365e1bb9 (patch)
tree9327c1436c1aeec455971d8af1ec761b08496027 /platform/qt
parent05df451f3c370e6ba8a02d8b0268d88c23db269b (diff)
downloadqtlocation-mapboxgl-a3244421a54660a699c669988943035b365e1bb9.tar.gz
[Qt] Rename files with same name
QMake is having some issues with files with same names when building the Qt Location plugin.
Diffstat (limited to 'platform/qt')
-rw-r--r--platform/qt/qt.cmake2
-rw-r--r--platform/qt/src/qt_image.cpp (renamed from platform/qt/src/image.cpp)0
2 files changed, 1 insertions, 1 deletions
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