diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-24 17:28:43 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-24 17:28:43 +0200 |
| commit | d8a590676b6c7d72406bd2f9b8185f38282fdfa7 (patch) | |
| tree | c081ff601ae4a56ecda95f52ca17e4bcfe402a1f /src/core/qtwebengine.gypi | |
| parent | 0c6147d9b5ffbe18bfe1e8deb9cc128c9a0fad27 (diff) | |
| parent | e643f766fa23ee73f7095d7ba20a385cef0f25a0 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ice3d6e88238940a62d75e7c67f63b626285fccb0
Diffstat (limited to 'src/core/qtwebengine.gypi')
| -rw-r--r-- | src/core/qtwebengine.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi index 7a6b26ab7..a420918a0 100644 --- a/src/core/qtwebengine.gypi +++ b/src/core/qtwebengine.gypi @@ -114,5 +114,8 @@ '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', ], }], + ['OS=="mac"', { + 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, + }], ], } |