diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-30 15:44:09 -0400 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-30 15:44:09 -0400 |
| commit | 930d0632595da72311e46f446f6ac42f958ce79a (patch) | |
| tree | 8e2ce9d692d437673f739bd7c166aa004337a0f7 /test | |
| parent | 592ed57d09f8f0913dae195e6e867884d11a2327 (diff) | |
| parent | 307488adf8354b14e806bb10210f5a9cb9980de8 (diff) | |
| download | qtlocation-mapboxgl-930d0632595da72311e46f446f6ac42f958ce79a.tar.gz | |
Merge branch 'master' into platform-image
Conflicts:
gyp/install.gypi
Diffstat (limited to 'test')
| -rw-r--r-- | test/test.gyp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/test.gyp b/test/test.gyp index 9e56f4f2c0..249be64076 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -26,7 +26,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, @@ -44,7 +44,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, @@ -62,7 +62,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, @@ -83,7 +83,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, @@ -101,7 +101,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, @@ -119,7 +119,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, @@ -137,7 +137,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, @@ -155,7 +155,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, |