diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-01 17:36:38 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-06 19:45:45 +0200 |
commit | 26b7fee65a3c23a9c2447d549668f373bfa76bae (patch) | |
tree | fca7565930f8d7705cb5d96c5bc5ce6d7e561a0c /recipes-qt/qt5/qtwebengine_git.bb | |
parent | 0663bcdddf0311329e607416cd51ce55b9557240 (diff) | |
download | meta-qt5-26b7fee65a3c23a9c2447d549668f373bfa76bae.tar.gz |
qtwebengine: Add 2 more patches to fix do_configure and fix QA warning
* otherwise moc generated files have the same basename and do_configure fails with:
core_generated.gyp:QtWebEngineCore#target has several files with the same basename:
| javascript_dialog_controller: javascript_dialog_controller.cpp
| /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOINC+21f6ce84ec-r0/git/src/core/.moc/moc_/OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOI.moc+21f6ce84ec-r0/git/src/core/javascript_dialog_controller.cpp
...
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index f4964bf7..d06c5214 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -14,9 +14,11 @@ QT_MODULE_BRANCH = "master" | |||
14 | SRC_URI = " \ | 14 | SRC_URI = " \ |
15 | git://gitorious.org/qt-labs/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \ | 15 | git://gitorious.org/qt-labs/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \ |
16 | git://gitorious.org/qt-labs/chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH};destsuffix=git/src/3rdparty \ | 16 | git://gitorious.org/qt-labs/chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH};destsuffix=git/src/3rdparty \ |
17 | file://0001-Drop-build-time-only-dependency-on-x11-libraries.patch \ | 17 | file://0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch \ |
18 | file://0002-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch \ | 18 | file://0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ |
19 | file://0001-Strip-unwanted-echo-compiling-prefix-from-CC.patch \ | 19 | file://0003-functions.prf-Try-to-add-_moc-suffix.patch \ |
20 | file://0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch \ | ||
21 | file://0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch \ | ||
20 | " | 22 | " |
21 | SRCREV_qtwebengine = "21f6ce84ecca9a4ff2aa980b21d2e5174c78d14b" | 23 | SRCREV_qtwebengine = "21f6ce84ecca9a4ff2aa980b21d2e5174c78d14b" |
22 | SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff" | 24 | SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff" |