From a8a817bb744cae8b7c161d92df5772cdec3183ca Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 6 Jun 2014 12:02:05 -0300 Subject: [PATCH] qt5.inc: Fix packaging of plugins The qtmultimedia module install the plugins in a sub-directory however those were not being packaged. This patch fixes following QA error: ERROR: QA Issue: qtmultimedia: Files/directories were installed but not shipped /usr/lib/qt5/plugins/video /usr/lib/qt5/plugins/video/videonode /usr/lib/qt5/plugins/video/videonode/libimx6vivantevideonode.so /usr/lib/qt5/plugins/video/videonode/.debug /usr/lib/qt5/plugins/video/videonode/.debug/libimx6vivantevideonode.so Reported-by: Lauren Post (From meta-qt5 rev: 9957ec5d0176912e189cf7e243617ed9c3cde57a) Signed-off-by: Otavio Salvador Signed-off-by: Patrick Ohly --- meta-qt5/recipes-qt/qt5/qt5.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-qt5/recipes-qt/qt5/qt5.inc b/meta-qt5/recipes-qt/qt5/qt5.inc index dfc1c76..bb0bcdc 100644 --- a/meta-qt5/recipes-qt/qt5/qt5.inc +++ b/meta-qt5/recipes-qt/qt5/qt5.inc @@ -1,4 +1,4 @@ -# Copyright (C) 2012 O.S. Systems Software LTDA. +# Copyright (C) 2012, 2014 O.S. Systems Software LTDA. # Copyright (C) 2013 Martin Jansa inherit qmake5 @@ -54,6 +54,8 @@ FILES_${PN}-tools-dbg = " \ " FILES_${PN}-plugins-dbg = " \ ${OE_QMAKE_PATH_PLUGINS}/*/.debug/* \ + ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \ + ${OE_QMAKE_PATH_PLUGINS}/*/*/*/.debug/* \ " # extra packages @@ -98,6 +100,8 @@ FILES_${PN}-tools = " \ " FILES_${PN}-plugins = " \ ${OE_QMAKE_PATH_PLUGINS}/*/*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_PLUGINS}/*/*/*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_PLUGINS}/*/*/*/*${SOLIBSDEV} \ " FILES_${PN}-mkspecs = "\ ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \ -- 2.7.4