2 files changed, 8 insertions, 11 deletions

diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 3ba352cb..93567881 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -86,20 +86,14 @@ do_install() {
     oe_runmake install INSTALL_ROOT=${D}
 }
 
-PACKAGES .= "${PN}-tools ${PN}-plugins ${PN}-plugins-dbg"
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dbg = "${libdir}/.debug/*.so.*"
-FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/*"
-FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/plugins/.debug/*"
+PACKAGES =. "${PN}-tools ${PN}-plugins ${PN}-plugins-dbg "
+FILES_${PN}-tools = "${bindir}/*"
+FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/*/*${SOLIBSDEV}"
+FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*"
 
-FILES_${PN}-dev = " \
+FILES_${PN}-dev += " \
         ${libdir}/cmake/* \
-        ${libdir}/pkgconfig/*.pc \
-        ${libdir}/*.la \
         ${libdir}/*.prl \
         ${includedir}/qt5/* \
         ${datadir}/qt5/* \
 "
-FILES_${PN}-staticdev = "${libdir}/libQt*.a"
-FILES_${PN}-tools = "${bindir}/*"
-FILES_${PN}-doc = "${datadir}/doc/*"
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 1130ab68..52c95a3a 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -120,3 +120,6 @@ do_install_append() {
     rm ${D}/${bindir}/qmake
     install -m 0755 bin/qmake2 ${D}${bindir}/qmake
 }
+
+PACKAGES =. "${PN}-fonts "
+FILES_${PN}-fonts = "${libdir}/fonts"