diff options
Diffstat (limited to 'platform/qt')
| -rw-r--r-- | platform/qt/config.cmake | 8 | ||||
| -rw-r--r-- | platform/qt/qt.cmake | 30 | ||||
| -rw-r--r-- | platform/qt/src/sqlite3.cpp | 2 |
3 files changed, 20 insertions, 20 deletions
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index a2c6b0a9e9..68b32b9eb9 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -6,7 +6,7 @@ macro(mbgl_platform_core) ) target_include_directories(mbgl-core - PUBLIC platform/default + PUBLIC platform/default/include PRIVATE platform/qt PRIVATE platform/qt/include ) @@ -18,8 +18,8 @@ macro(mbgl_platform_core) if(NOT WITH_QT_DECODERS) target_sources(mbgl-core - PRIVATE platform/default/jpeg_reader.cpp - PRIVATE platform/default/png_reader.cpp + PRIVATE platform/default/src/mbgl/util/jpeg_reader.cpp + PRIVATE platform/default/src/mbgl/util/png_reader.cpp ) target_add_mason_package(mbgl-core PRIVATE libjpeg-turbo) @@ -29,7 +29,7 @@ macro(mbgl_platform_core) endif() if(NOT WITH_QT_I18N) - target_sources(mbgl-core PRIVATE platform/default/bidi.cpp) + target_sources(mbgl-core PRIVATE platform/default/src/mbgl/text/bidi.cpp) target_link_libraries(mbgl-core PRIVATE icu) else() target_sources(mbgl-core PRIVATE platform/qt/src/bidi.cpp) diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 2e334563ed..a7b48ac4b1 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -11,17 +11,17 @@ set(CMAKE_AUTORCC ON) set(MBGL_QT_CORE_FILES # Headless view - PRIVATE platform/default/mbgl/gl/headless_frontend.cpp - PRIVATE platform/default/mbgl/gl/headless_frontend.hpp - PRIVATE platform/default/mbgl/gl/headless_backend.cpp - PRIVATE platform/default/mbgl/gl/headless_backend.hpp + PRIVATE platform/default/src/mbgl/gl/headless_frontend.cpp + PRIVATE platform/default/include/mbgl/gl/headless_frontend.hpp + PRIVATE platform/default/src/mbgl/gl/headless_backend.cpp + PRIVATE platform/default/include/mbgl/gl/headless_backend.hpp PRIVATE platform/qt/src/headless_backend_qt.cpp # Thread pool - PRIVATE platform/default/mbgl/util/shared_thread_pool.cpp - PRIVATE platform/default/mbgl/util/shared_thread_pool.hpp - PRIVATE platform/default/mbgl/util/default_thread_pool.cpp - PRIVATE platform/default/mbgl/util/default_thread_pool.hpp + PRIVATE platform/default/src/mbgl/util/shared_thread_pool.cpp + PRIVATE platform/default/include/mbgl/util/shared_thread_pool.hpp + PRIVATE platform/default/src/mbgl/util/default_thread_pool.cpp + PRIVATE platform/default/include/mbgl/util/default_thread_pool.hpp # Thread PRIVATE platform/qt/src/thread_local.cpp @@ -38,13 +38,13 @@ set(MBGL_QT_CORE_FILES PRIVATE platform/qt/src/timer_impl.hpp PRIVATE platform/qt/src/utf.cpp - PRIVATE platform/default/local_glyph_rasterizer.cpp - PRIVATE platform/default/collator.cpp - PRIVATE platform/default/unaccent.cpp - PRIVATE platform/default/unaccent.hpp + PRIVATE platform/default/src/mbgl/text/local_glyph_rasterizer.cpp + PRIVATE platform/default/src/mbgl/text/collator.cpp + PRIVATE platform/default/src/mbgl/text/unaccent.cpp + PRIVATE platform/default/include/mbgl/text/unaccent.hpp #Layer manager - PRIVATE platform/default/layer_manager.cpp + PRIVATE platform/default/src/mbgl/layermanager/layer_manager.cpp ) set(MBGL_QT_FILESOURCE_FILES @@ -76,7 +76,7 @@ add_library(qmapboxgl SHARED platform/qt/src/qmapboxgl_renderer_backend.hpp platform/qt/src/qmapboxgl_scheduler.cpp platform/qt/src/qmapboxgl_scheduler.hpp - platform/default/mbgl/util/default_styles.hpp + platform/default/include/mbgl/util/default_styles.hpp ) target_include_directories(qmapboxgl @@ -150,7 +150,7 @@ if (MASON_PLATFORM STREQUAL "osx" OR MASON_PLATFORM STREQUAL "ios") ) elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") list(APPEND MBGL_QT_CORE_FILES - PRIVATE platform/default/thread.cpp + PRIVATE platform/default/src/mbgl/util/thread.cpp ) elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") add_definitions("-DQT_COMPILING_QIMAGE_COMPAT_CPP") diff --git a/platform/qt/src/sqlite3.cpp b/platform/qt/src/sqlite3.cpp index 6427126875..75befc37c8 100644 --- a/platform/qt/src/sqlite3.cpp +++ b/platform/qt/src/sqlite3.cpp @@ -1,4 +1,4 @@ -#include "sqlite3.hpp" +#include <mbgl/storage/sqlite3.hpp> #include <QSqlDatabase> #include <QSqlError> |