From 26b7fee65a3c23a9c2447d549668f373bfa76bae Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 1 Jul 2014 17:36:38 +0200 Subject: 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 --- recipes-qt/qt5/qtwebengine.inc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'recipes-qt/qt5/qtwebengine.inc') 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() { QMAKE_AR="${OE_QMAKE_AR}" } +do_install_append() { + rmdir ${D}${OE_QMAKE_PATH_PLUGINS}/${BPN} ${D}${OE_QMAKE_PATH_PLUGINS} || true +} PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" -- cgit v1.2.3-54-g00ecf