diff options
author | Jonathan Liu <net147@gmail.com> | 2014-10-16 15:44:05 +1100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-30 14:15:41 +0100 |
commit | 264f20883cae2c5e5222538b3f76e2145e72b1ab (patch) | |
tree | 6cfe17e35b1ad27aa344a81df1eaa82aedf13236 /recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch | |
parent | 01f1ab8ee8ca31b39d097a913f9f6f8de89f5fb5 (diff) | |
download | meta-qt5-264f20883cae2c5e5222538b3f76e2145e72b1ab.tar.gz |
qtwebengine: backport patches to fix ARM build failures
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch index 173f7f73..2e2c177e 100644 --- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch +++ b/recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b0e844967728edf814d611bb1c69d320a8a6c64d Mon Sep 17 00:00:00 2001 | 1 | From 8e540a678a796d78ff9a98986d747afbca7f63be Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Tue, 1 Jul 2014 15:58:16 +0200 | 3 | Date: Tue, 1 Jul 2014 15:58:16 +0200 |
4 | Subject: [PATCH 3/3] functions.prf: Try to add _moc suffix | 4 | Subject: [PATCH 3/6] functions.prf: Try to add _moc suffix |
5 | 5 | ||
6 | * otherwise moc generated files have the same basename and do_configure fails with: | 6 | * otherwise moc generated files have the same basename and do_configure fails with: |
7 | core_generated.gyp:QtWebEngineCore#target has several files with the same basename: | 7 | core_generated.gyp:QtWebEngineCore#target has several files with the same basename: |