tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Qt] Use Qt decoder instead of nunicode

Browse Source
This commit is contained in:
Thiago Marcos P. Santos
2016-07-22 19:44:08 +03:00
committed by Konstantin Käfer
parent e1f11eed35
commit 795d17dbdb
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/qt/config.cmake
View File

@@ -1,6 +1,5 @@
include(platform/qt/qt.cmake)
mason_use(nunicode 1.6)
mason_use(sqlite 3.9.1)
if(NOT WITH_QT_DECODERS)
@@ -19,7 +18,6 @@ macro(mbgl_platform_core)
PRIVATE platform/qt/include
)
target_add_mason_package(mbgl-core PRIVATE nunicode)
target_add_mason_package(mbgl-core PRIVATE sqlite)
target_link_libraries(mbgl-core

6
platform/qt/qt.cmake
View File

@@ -9,8 +9,8 @@ endif()
option(WITH_QT_DECODERS "Use builtin Qt image decoders" OFF)
option(WITH_QT_4 "Use Qt4 instead of Qt5" OFF)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -D__QT__")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -D__QT__")
project(Qt4And5)
@@ -35,7 +35,6 @@ set(MBGL_QT_FILES
# Misc
PRIVATE platform/default/log_stderr.cpp
PRIVATE platform/default/string_stdlib.cpp
# Platform integration
PRIVATE platform/qt/src/async_task.cpp
@@ -50,6 +49,7 @@ set(MBGL_QT_FILES
PRIVATE platform/qt/src/qmapboxgl_p.hpp
PRIVATE platform/qt/src/run_loop.cpp
PRIVATE platform/qt/src/run_loop_impl.hpp
PRIVATE platform/qt/src/string_stdlib.cpp
PRIVATE platform/qt/src/timer.cpp
PRIVATE platform/qt/src/timer_impl.hpp