diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-07-15 20:28:17 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-07-16 10:38:42 +0300 |
| commit | 3fd874de8d0e49d8a7ae3c57eefad3c69a16b65b (patch) | |
| tree | 180fc47dfc0d76cd2c573d4d648ad3c0187148be /platform/qt | |
| parent | e23d8adf8c7942950b0cf28d35efa25ec9fdff13 (diff) | |
| download | qtlocation-mapboxgl-3fd874de8d0e49d8a7ae3c57eefad3c69a16b65b.tar.gz | |
[Qt] Use the thread implementation appropriated to the target
Qt has a thread abstraction, but we would need to use QThread to use it.
Diffstat (limited to 'platform/qt')
| -rw-r--r-- | platform/qt/platform.gyp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/platform/qt/platform.gyp b/platform/qt/platform.gyp index 33bd5779a1..880e366532 100644 --- a/platform/qt/platform.gyp +++ b/platform/qt/platform.gyp @@ -47,7 +47,6 @@ '../default/online_file_source.cpp', '../default/sqlite3.cpp', '../default/string_stdlib.cpp', - '../default/thread.cpp', 'include/qmapbox.hpp', 'include/qmapboxgl.hpp', 'include/qquickmapboxgl.hpp', @@ -168,16 +167,25 @@ ['OS == "mac"', { 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags)' ], - } + }, + 'sources': [ + '../darwin/src/nsthread.mm', + ], }, { 'cflags_cc': [ '<@(cflags)' ], + 'sources': [ + '../default/thread.cpp', + ], }] ], 'link_settings': { 'conditions': [ ['OS == "mac"', { - 'libraries': [ '<@(libraries)' ], + 'libraries': [ + '<@(libraries)', + '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', + ], 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { 'libraries': [ '<@(libraries)', '<@(ldflags)' ], |