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.inc | |
| 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.inc')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine.inc b/recipes-qt/qt5/qtwebengine.inc index b6f56ae2..060faa7b 100644 --- a/recipes-qt/qt5/qtwebengine.inc +++ b/recipes-qt/qt5/qtwebengine.inc | |||
| @@ -41,4 +41,7 @@ do_configure() { | |||
| 41 | QMAKE_AR="${OE_QMAKE_AR}" | 41 | QMAKE_AR="${OE_QMAKE_AR}" |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | do_install_append() { | ||
| 45 | rmdir ${D}${OE_QMAKE_PATH_PLUGINS}/${BPN} ${D}${OE_QMAKE_PATH_PLUGINS} || true | ||
| 46 | } | ||
| 44 | PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" | 47 | PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" |