Patchwork [meta-qt5] qt5.inc: Fix packaging of plugins

login
register
mail settings
Submitter Otavio Salvador
Date June 6, 2014, 3:11 p.m.
Message ID <1402067470-15080-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/73415/
State Accepted, archived
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - June 6, 2014, 3:11 p.m.
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 <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-qt/qt5/qt5.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Patch

diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index dfc1c76..bb0bcdc 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/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 <martin.jansa@gmail.com>
 
 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 \