diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-07-22 14:04:31 +0300 |
---|---|---|
committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-07-22 18:56:30 +0300 |
commit | 65e2822f21b1a3c797d8da9c00160248845370af (patch) | |
tree | d78e0e33f814c8dcc9f82d62b0c7ad13faff75b5 /platform/qt/scripts/configure.sh | |
parent | 0f367c93d01c98912fd658235d5e4f2a01a91fe7 (diff) | |
download | qtlocation-mapboxgl-65e2822f21b1a3c797d8da9c00160248845370af.tar.gz |
[Qt] Use Qt text codec instead of nunicode
Remove one extra dependency. Qt has some bugs on the text codec it
seems, but it is also important to keep the behavior aligned with
the client API.
Diffstat (limited to 'platform/qt/scripts/configure.sh')
-rw-r--r-- | platform/qt/scripts/configure.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh index 42541032c0..be809708ba 100644 --- a/platform/qt/scripts/configure.sh +++ b/platform/qt/scripts/configure.sh @@ -10,7 +10,6 @@ GEOJSON_VERSION=0.1.4${CXX11ABI:-} GEOJSONVT_VERSION=6.1.0 GTEST_VERSION=1.7.0${CXX11ABI:-} LIBJPEG_TURBO_VERSION=1.4.2 -NUNICODE_VERSION=1.6 PIXELMATCH_VERSION=0.9.0 RAPIDJSON_VERSION=1.0.2 SQLITE_VERSION=3.9.1 @@ -20,12 +19,15 @@ WEBP_VERSION=0.5.0 EARCUT_VERSION=0.11 function print_default_flags { - CONFIG+=" 'cflags': $(quote_flags -fvisibility=hidden),"$LN + CONFIG+=" 'cflags': $(quote_flags -fvisibility=hidden -D__QT__),"$LN } if [ "$MASON_PLATFORM" == "osx" ]; then + # XXX: Argh, adding the __QT__ flag here because GYP for OSX does + # not respect the `cflags` variable above and we need it to reach + # the utests somehow. Gonna be fixed properly when we move to CMake. function print_opengl_flags { - CONFIG+=" 'opengl_cflags%': [],"$LN + CONFIG+=" 'opengl_cflags%': ['-D__QT__'],"$LN CONFIG+=" 'opengl_ldflags%': ['-framework OpenGL', '-framework CoreFoundation'],"$LN } else |