diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-25 14:55:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-28 17:20:36 +0100 |
| commit | 25ff83bc7b3e921aa540b88f6c848a78ee7d461f (patch) | |
| tree | 4a455f2410e5e1c0cbdfd91a4dce40c75532c9f0 /patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch | |
| parent | 175dba21885a5bcbd031c1cbc394825b5fbb783e (diff) | |
Update patches to stable branch 1750
Change-Id: I85149bf4405420813d07bee5259f11a192e86a73
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Diffstat (limited to 'patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch')
| -rw-r--r-- | patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch b/patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch deleted file mode 100644 index 8d659eb34..000000000 --- a/patches/chromium/third_party/libvpx/0001-LIBVPX-Add-path-for-QtWebEngine-build-in-Windows-specific-actions.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Zoltan Arvai <zarvai@inf.u-szeged.hu> -Date: Mon, 24 Feb 2014 07:29:32 -0800 -Subject: LIBVPX: Add path for QtWebEngine build in Windows specific actions - ---- - libvpx.gyp | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/libvpx.gyp b/libvpx.gyp -index 392ccde..7f1a18d 100644 ---- a/libvpx.gyp -+++ b/libvpx.gyp -@@ -402,6 +402,7 @@ - '-s', '<(PRODUCT_DIR)/obj/libvpx_asm_offsets_vp8/vp8_asm_enc_offsets.obj', - '-s', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj', - '-s', '<(PRODUCT_DIR)/obj/Source/WebKit/chromium/third_party/libvpx/<(libvpx_source)/vp8/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj', -+ '-s', '<(qtwe_chromium_obj_dir)/third_party/libvpx/<(libvpx_source)/vp8/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj', - ], - 'process_output_as_sources': 1, - 'msvs_cygwin_shell': 1, -@@ -500,6 +501,7 @@ - '-s', '<(PRODUCT_DIR)/obj/libvpx_asm_offsets_vpx_scale/vpx_scale_asm_offsets.obj', - '-s', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj', - '-s', '<(PRODUCT_DIR)/obj/Source/WebKit/chromium/third_party/libvpx/<(libvpx_source)/vpx_scale/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj', -+ '-s', '<(qtwe_chromium_obj_dir)/third_party/libvpx/<(libvpx_source)/vpx_scale/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj', - ], - 'process_output_as_sources': 1, - 'msvs_cygwin_shell': 1, |