diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-07-22 19:44:08 +0300 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-07-26 12:48:58 +0200 |
| commit | aba8caeb9ed33b01f9bc73ba56a748f097258524 (patch) | |
| tree | e74d6b0f039a40a815a4ff449908c64a5035ed2e | |
| parent | 2bab5d18e6895745c828fb5d68b285bd41aeef9e (diff) | |
| download | qtlocation-mapboxgl-aba8caeb9ed33b01f9bc73ba56a748f097258524.tar.gz | |
[Qt] Use Qt decoder instead of nunicode
| -rw-r--r-- | platform/qt/config.cmake | 2 | ||||
| -rw-r--r-- | platform/qt/qt.cmake | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index 41abe30174..5a5a150286 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -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 diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index c2cebd7964..d2b1dbcbdd 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -4,8 +4,8 @@ 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) @@ -30,7 +30,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 @@ -45,6 +44,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 |