diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-01-07 15:15:11 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-01-07 15:15:11 -0800 |
commit | c32f7dfa88bbcf541007b267da1fa128986a4080 (patch) | |
tree | 9c9953341ab43b01958e0706094155acb883188e /macosx | |
parent | abf702046be5f03eb9153f120ba356d860bb94f3 (diff) | |
parent | 7eaa4fabde5de99c8a0e8f8f3dc5362bc0887d24 (diff) | |
download | qtlocation-mapboxgl-c32f7dfa88bbcf541007b267da1fa128986a4080.tar.gz |
Merge branch 'master' into shader-performance
Diffstat (limited to 'macosx')
-rw-r--r-- | macosx/main.mm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/macosx/main.mm b/macosx/main.mm index 228b05f0b4..39ddde10d0 100644 --- a/macosx/main.mm +++ b/macosx/main.mm @@ -102,9 +102,7 @@ int main() { if (accessToken) fileSource.setAccessToken([accessToken cStringUsingEncoding:[NSString defaultCStringEncoding]]); // Load style - const std::string path([[[NSBundle mainBundle] pathForResource:@"bright-v6" ofType:@"json" inDirectory:@"styles/"] UTF8String]); - - map.setStyleURL(std::string("file://") + path); + map.setStyleURL("asset://styles/bright-v6.json"); int ret = view.run(); |