qt5.inc: Fix packaging of plugins
authorOtavio Salvador <otavio@ossystems.com.br>
Fri, 6 Jun 2014 15:02:05 +0000 (12:02 -0300)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 16:45:54 +0000 (08:45 -0800)
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>
(From meta-qt5 rev: 9957ec5d0176912e189cf7e243617ed9c3cde57a)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
meta-qt5/recipes-qt/qt5/qt5.inc

index dfc1c76..bb0bcdc 100644 (file)
@@ -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 \