summaryrefslogtreecommitdiff
path: root/platform/qt
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <thiago@mapbox.com>2016-07-22 19:44:08 +0300
committerKonstantin Käfer <mail@kkaefer.com>2016-08-05 11:42:22 +0200
commit795d17dbdb33186071f4ecef2fc672bf2767782a (patch)
treed404a9b4eea4066e8627bbe1807993fa483a2913 /platform/qt
parente1f11eed3540938ef0eff46b8180bc88084fd5c6 (diff)
downloadqtlocation-mapboxgl-795d17dbdb33186071f4ecef2fc672bf2767782a.tar.gz
[Qt] Use Qt decoder instead of nunicode
Diffstat (limited to 'platform/qt')
-rw-r--r--platform/qt/config.cmake2
-rw-r--r--platform/qt/qt.cmake6
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 eb64e0f288..afd3ed7958 100644
--- a/platform/qt/qt.cmake
+++ b/platform/qt/qt.cmake
@@ -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